[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] feature/aptel/dynamic-modules-rc3 1da9b91 24/25: opaque mo
From: |
Teodor Zlatanov |
Subject: |
[Emacs-diffs] feature/aptel/dynamic-modules-rc3 1da9b91 24/25: opaque module: rename Qc variable to Qc_ due to macro collision |
Date: |
Wed, 04 Feb 2015 22:56:28 +0000 |
branch: feature/aptel/dynamic-modules-rc3
commit 1da9b91ba483b859fb18d87cd86d3032a611e46d
Author: Aurélien Aptel <address@hidden>
Commit: Aurélien Aptel <address@hidden>
opaque module: rename Qc variable to Qc_ due to macro collision
---
modules/opaque/opaque.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/modules/opaque/opaque.c b/modules/opaque/opaque.c
index 2366b2e..7ece9b5 100644
--- a/modules/opaque/opaque.c
+++ b/modules/opaque/opaque.c
@@ -9,7 +9,7 @@ struct opaque
int a, b, c;
};
-static Lisp_Object Qa, Qb, Qc;
+static Lisp_Object Qopaque, Qa, Qb, Qc_;
EXFUN (Fopaque_make, 3);
DEFUN ("opaque-make", Fopaque_make, Sopaque_make, 3, 3, 0,
@@ -44,7 +44,7 @@ DEFUN ("opaque-get", Fopaque_get, Sopaque_get, 2, 2, 0,
(Lisp_Object obj, Lisp_Object f)
{
struct opaque *p = XSAVE_POINTER (obj, 0);
- int val = EQ (f, Qa) ? p->a : EQ (f, Qb) ? p->b : EQ (f, Qc) ? p->c : -1;
+ int val = EQ (f, Qa) ? p->a : EQ (f, Qb) ? p->b : EQ (f, Qc_) ? p->c : -1;
return make_number (val);
}
@@ -54,7 +54,7 @@ void init ()
DEFSYM (Qa, "a");
DEFSYM (Qb, "b");
- DEFSYM (Qc, "c");
+ DEFSYM (Qc_, "c");
defsubr (&Sopaque_make);
defsubr (&Sopaque_free);
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 9da7346 13/25: new module: curl. basic URL fetcher working., (continued)
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 9da7346 13/25: new module: curl. basic URL fetcher working., Teodor Zlatanov, 2015/02/04
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 582704c 14/25: curl: use url arg., Teodor Zlatanov, 2015/02/04
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 8147699 15/25: fix docstring., Teodor Zlatanov, 2015/02/04
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 a95e032 17/25: update modules examples with `provide' call., Teodor Zlatanov, 2015/02/04
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 1959b65 18/25: use `load-module-suffixes' as a source of module suffixes., Teodor Zlatanov, 2015/02/04
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 8254721 16/25: make `load' look for and handle dynamic modules., Teodor Zlatanov, 2015/02/04
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 4000103 20/25: yaml module: add `yaml-parse-string'., Teodor Zlatanov, 2015/02/04
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 c7248ea 21/25: yaml module: rename `yaml-parse' to `yaml-parse-buffer'., Teodor Zlatanov, 2015/02/04
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 092a6d2 22/25: configure.ac: dynamic modules off by default., Teodor Zlatanov, 2015/02/04
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 4e1ad37 19/25: new yaml parsing module using libyaml, Teodor Zlatanov, 2015/02/04
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 1da9b91 24/25: opaque module: rename Qc variable to Qc_ due to macro collision,
Teodor Zlatanov <=
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 9a1d734 25/25: modules/: add proper testing, Teodor Zlatanov, 2015/02/04
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 41ec64b 23/25: Merge branch 'master' into dynamic-modules, Teodor Zlatanov, 2015/02/04