[Emacs-diffs] feature/aptel/dynamic-modules-rc3 f52bd1f 6/9: modules: prefix all global module variable with M

[Teodor Zlatanov]

branch: feature/aptel/dynamic-modules-rc3
commit f52bd1f9378fc94471ee48a88f60ffcdff926cec
Author: Aurélien Aptel <address@hidden>
Commit: Aurélien Aptel <address@hidden>

    modules: prefix all global module variable with M
---
 modules/curl/curl.c     |    6 +++---
 modules/opaque/opaque.c |   16 ++++++++--------
 modules/yaml/yaml.c     |    6 +++---
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/modules/curl/curl.c b/modules/curl/curl.c
index b8b2bb6..e74b858 100644
--- a/modules/curl/curl.c
+++ b/modules/curl/curl.c
@@ -7,7 +7,7 @@
 #include <lisp.h>
 
 int plugin_is_GPL_compatible;
-static Lisp_Object Qcurl;
+static Lisp_Object MQcurl;
 
 struct buffer
 {
@@ -107,12 +107,12 @@ void init ()
   curl_global_init (CURL_GLOBAL_ALL);
   /* when unloading: curl_global_cleanup(); */
 
-  DEFSYM (Qcurl, "curl");
+  MQcurl = intern ("curl");
 
   defsubr (&Scurl_make);
   defsubr (&Scurl_fetch_url);
   defsubr (&Scurl_content);
   defsubr (&Scurl_free);
 
-  Fprovide (Qcurl, Qnil);
+  Fprovide (MQcurl, Qnil);
 }
diff --git a/modules/opaque/opaque.c b/modules/opaque/opaque.c
index 7ece9b5..f243ea7 100644
--- a/modules/opaque/opaque.c
+++ b/modules/opaque/opaque.c
@@ -2,14 +2,14 @@
 #include <lisp.h>
 
 int plugin_is_GPL_compatible;
-static Lisp_Object Qopaque;
+static Lisp_Object MQopaque;
 
 struct opaque
 {
   int a, b, c;
 };
 
-static Lisp_Object Qopaque, Qa, Qb, Qc_;
+static Lisp_Object MQopaque, MQa, MQb, MQc;
 
 EXFUN (Fopaque_make, 3);
 DEFUN ("opaque-make", Fopaque_make, Sopaque_make, 3, 3, 0,
@@ -44,21 +44,21 @@ 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, MQa) ? p->a : EQ (f, MQb) ? p->b : EQ (f, MQc) ? p->c : -1;
   return make_number (val);
 }
 
 void init ()
 {
-  DEFSYM (Qopaque, "opaque");
+  MQopaque = intern ("opaque");
 
-  DEFSYM (Qa, "a");
-  DEFSYM (Qb, "b");
-  DEFSYM (Qc_, "c");
+  MQa = intern ("a");
+  MQb = intern ("b");
+  MQc = intern ("c");
 
   defsubr (&Sopaque_make);
   defsubr (&Sopaque_free);
   defsubr (&Sopaque_get);
 
-  Fprovide (Qopaque, Qnil);
+  Fprovide (MQopaque, Qnil);
 }
diff --git a/modules/yaml/yaml.c b/modules/yaml/yaml.c
index 3ff1334..8c3295e 100644
--- a/modules/yaml/yaml.c
+++ b/modules/yaml/yaml.c
@@ -11,7 +11,7 @@
 #include <buffer.h>
 
 int plugin_is_GPL_compatible;
-static Lisp_Object Qyaml;
+static Lisp_Object MQyaml;
 
 typedef unsigned char uchar;
 
@@ -222,11 +222,11 @@ DEFUN ("yaml-parse-file", Fyaml_parse_file, 
Syaml_parse_file, 1, 1, 0,
 
 void init ()
 {
-  DEFSYM (Qyaml, "yaml");
+  MQyaml = intern ("yaml");
 
   defsubr (&Syaml_parse_file);
   defsubr (&Syaml_parse_string);
   defsubr (&Syaml_parse_buffer);
 
-  Fprovide (Qyaml, Qnil);
+  Fprovide (MQyaml, Qnil);
 }