[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-25 f2c0025: Rename module.c to emacs-module.c, etc.
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] emacs-25 f2c0025: Rename module.c to emacs-module.c, etc. |
Date: |
Thu, 19 Nov 2015 21:51:29 +0000 |
branch: emacs-25
commit f2c002592196297a3517b3ed1f05c8ac7b096044
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
Rename module.c to emacs-module.c, etc.
* src/emacs-module.c: Rename from src/module.c.
* src/emacs-module.h: Rename from src/module.h.
All uses changed.
---
configure.ac | 2 +-
modules/mod-test/mod-test.c | 2 +-
modules/modhelp.py | 2 +-
src/Makefile.in | 2 +-
src/{module.c => emacs-module.c} | 4 ++--
src/{module.h => emacs-module.h} | 2 +-
src/lisp.h | 2 +-
7 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/configure.ac b/configure.ac
index 4d34c1a..d5638bf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3320,7 +3320,7 @@ if test "${with_modules}" != "no"; then
fi
if test "${HAVE_MODULES}" = yes; then
- MODULES_OBJ="dynlib.o module.o"
+ MODULES_OBJ="dynlib.o emacs-module.o"
AC_DEFINE(HAVE_MODULES, 1, [Define to 1 if dynamic modules are enabled])
AC_DEFINE_UNQUOTED(MODULES_SUFFIX, "$MODULES_SUFFIX",
[System extension for dynamic libraries])
diff --git a/modules/mod-test/mod-test.c b/modules/mod-test/mod-test.c
index b58b86c..e27fb58 100644
--- a/modules/mod-test/mod-test.c
+++ b/modules/mod-test/mod-test.c
@@ -19,7 +19,7 @@ along with GNU Emacs. If not, see
<http://www.gnu.org/licenses/>. */
#include <assert.h>
#include <stdio.h>
-#include <module.h>
+#include <emacs-module.h>
int plugin_is_GPL_compatible;
diff --git a/modules/modhelp.py b/modules/modhelp.py
index 45b849e..2210030 100755
--- a/modules/modhelp.py
+++ b/modules/modhelp.py
@@ -149,7 +149,7 @@ all: ${module}.so ${module}.doc
'''),
string.Template('${c_file}'): string.Template('''
-#include <module.h>
+#include <emacs-module.h>
int plugin_is_GPL_compatible;
diff --git a/src/Makefile.in b/src/Makefile.in
index 15171d4..4fee1be 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -232,7 +232,7 @@ LIBZ = @LIBZ@
## system-specific libs for dynamic modules, else empty
LIBMODULES = @LIBMODULES@
-## dynlib.o module.o if modules enabled, else empty
+## dynlib.o emacs-module.o if modules enabled, else empty
MODULES_OBJ = @MODULES_OBJ@
XRANDR_LIBS = @XRANDR_LIBS@
diff --git a/src/module.c b/src/emacs-module.c
similarity index 99%
rename from src/module.c
rename to src/emacs-module.c
index 98264df..4fa01bf 100644
--- a/src/module.c
+++ b/src/emacs-module.c
@@ -1,4 +1,4 @@
-/* module.c - Module loading and runtime implementation
+/* emacs-module.c - Module loading and runtime implementation
Copyright (C) 2015 Free Software Foundation, Inc.
@@ -24,7 +24,7 @@ along with GNU Emacs. If not, see
<http://www.gnu.org/licenses/>. */
#include <config.h>
#include "lisp.h"
-#include "module.h"
+#include "emacs-module.h"
#include "dynlib.h"
#include "coding.h"
#include "verify.h"
diff --git a/src/module.h b/src/emacs-module.h
similarity index 99%
rename from src/module.h
rename to src/emacs-module.h
index d4fad9d..0469597 100644
--- a/src/module.h
+++ b/src/emacs-module.h
@@ -1,4 +1,4 @@
-/* module.h - GNU Emacs module API.
+/* emacs-module.h - GNU Emacs module API.
Copyright (C) 2015 Free Software Foundation, Inc.
diff --git a/src/lisp.h b/src/lisp.h
index f953ceb..3b7bb40 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3914,7 +3914,7 @@ extern bool let_shadows_global_binding_p (Lisp_Object
symbol);
/* Defined in alloc.c. */
extern Lisp_Object make_user_ptr (void (*finalizer) (void*), void *p);
-/* Defined in module.c. */
+/* Defined in emacs-module.c. */
extern void module_init (void);
extern void mark_modules (void);
extern void syms_of_module (void);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-25 f2c0025: Rename module.c to emacs-module.c, etc.,
Paul Eggert <=