From 93c2622d754eae928268fdb26282fc7deec69ad1 Mon Sep 17 00:00:00 2001
From: Martin Nilsson <nilsson@opera.com>
Date: Sun, 24 Aug 2014 00:26:28 +0200
Subject: [PATCH] Remove some module_magic remnants.
---
bin/fake_dynamic_load.pike | 4 ----
src/MANIFEST | 4 ----
src/modules/_WhiteFish/whitefish.c | 9 ---------
src/post_modules/GTK1/dependencies | 3 +--
4 files changed, 1 insertion(+), 19 deletions(-)
diff --git a/bin/fake_dynamic_load.pike b/bin/fake_dynamic_load.pike
index cf44274709..1c0fd85f39 100755
--- a/bin/fake_dynamic_load.pike
+++ b/bin/fake_dynamic_load.pike
@@ -478,10 +478,6 @@ int main(int argc, array(string) argv)
ret+=sprintf(" (void *)& %s,\n",expr->name,expr->name);
ret+="0 };\n\n";
- /* Fixme: touch module_magic.h if we need to
- * recompile all the modules.
- */
-
Stdio.write_file("export_functions.c",ret);
ret="PMOD_EXPORT extern void **PikeSymbol;\n";
diff --git a/src/MANIFEST b/src/MANIFEST
index 3ee71764cc..0b4fda9810 100644
--- a/src/MANIFEST
+++ b/src/MANIFEST
@@ -321,10 +321,6 @@ Module system
Maintain the entry and exit hooks for the statically compiled
modules.
- module_magic.h
- Compatibility header for old modules that don't use
- PIKE_MODULE_INIT and PIKE_MODULE_EXIT.
-
module_support.c
module_support.h
Tools for importing and exporting symbols between modules. Also
diff --git a/src/modules/_WhiteFish/whitefish.c b/src/modules/_WhiteFish/whitefish.c
index 0f020a4ebd..a808522fc3 100644
--- a/src/modules/_WhiteFish/whitefish.c
+++ b/src/modules/_WhiteFish/whitefish.c
@@ -19,15 +19,6 @@
#include "blobs.h"
#include "linkfarm.h"
-/* 7.2 compatibility stuff. */
-
-#ifndef PIKE_MODULE_INIT
-/* must be included last */
-#include "module_magic.h"
-#define PIKE_MODULE_INIT void pike_module_init(void)
-#define PIKE_MODULE_EXIT void pike_module_exit(void)
-#endif
-
struct tofree
{
Blob **blobs;
diff --git a/src/post_modules/GTK1/dependencies b/src/post_modules/GTK1/dependencies
index d0737c4bcc..6dc47c5f28 100644
--- a/src/post_modules/GTK1/dependencies
+++ b/src/post_modules/GTK1/dependencies
@@ -3,5 +3,4 @@ dummy.o: $(SRCDIR)/dummy.c \
$(BUILD_BASE)/machine.h \
$(PIKE_SRC_DIR)/port.h \
$(PIKE_SRC_DIR)/dmalloc.h \
- pgtk_config.h \
- $(PIKE_SRC_DIR)/module_magic.h
+ pgtk_config.h
--
GitLab