[Carob-commits] CVS update of libmysequoia/ldtest (Makefile orig.c override.c plugin.c)

[marc]

    Date: Tuesday, April 17, 2007 @ 11:06:04
  Author: marc
    Path: /cvsroot/carob/libmysequoia/ldtest

Modified: Makefile (1.6 -> 1.7) orig.c (1.2 -> 1.3) override.c (1.2 ->
          1.3) plugin.c (1.2 -> 1.3)

Moved everything to C++ w extern "C". Needed to debug static 
init/loading/unloading


------------+
 Makefile   |    6 +++---
 orig.c     |    5 +++++
 override.c |    1 +
 plugin.c   |    9 ++++++---
 4 files changed, 15 insertions(+), 6 deletions(-)


Index: libmysequoia/ldtest/Makefile
diff -u libmysequoia/ldtest/Makefile:1.6 libmysequoia/ldtest/Makefile:1.7
--- libmysequoia/ldtest/Makefile:1.6    Mon Apr 16 16:22:11 2007
+++ libmysequoia/ldtest/Makefile        Tue Apr 17 11:06:04 2007
@@ -12,14 +12,14 @@
 all: ${ALL}
 
 liborig.so: orig.c
-       ${CC} ${DOLIB} $? -o $@
+       ${CXX} ${DOLIB} $? -o $@
 
 liboverride.so: override.c liborig.so
-       ${CC} ${DOLIB} -L. ${OVERLIBFLAGS} $? -o $@
+       ${CXX} ${DOLIB} -L. ${OVERLIBFLAGS} $? -o $@
 
 
 plugin.so: plugin.c liborig.so
-       ${CC} ${DOLIB} $? -o $@ -L. -lorig
+       ${CXX} ${DOLIB} $? -o $@ -L. -lorig
 
 
 main: main.cpp
Index: libmysequoia/ldtest/orig.c
diff -u libmysequoia/ldtest/orig.c:1.2 libmysequoia/ldtest/orig.c:1.3
--- libmysequoia/ldtest/orig.c:1.2      Mon Apr 16 16:01:27 2007
+++ libmysequoia/ldtest/orig.c  Tue Apr 17 11:06:04 2007
@@ -1,5 +1,10 @@
 
 
+extern "C" {
+  int intercepted();
+  int orig_calling_intercepted();
+}
+
 int intercepted()
 {
   return 0;
Index: libmysequoia/ldtest/override.c
diff -u libmysequoia/ldtest/override.c:1.2 libmysequoia/ldtest/override.c:1.3
--- libmysequoia/ldtest/override.c:1.2  Mon Apr 16 16:01:27 2007
+++ libmysequoia/ldtest/override.c      Tue Apr 17 11:06:04 2007
@@ -1,4 +1,5 @@
 
+extern "C" int intercepted();
 
 int intercepted()
 {
Index: libmysequoia/ldtest/plugin.c
diff -u libmysequoia/ldtest/plugin.c:1.2 libmysequoia/ldtest/plugin.c:1.3
--- libmysequoia/ldtest/plugin.c:1.2    Mon Apr 16 16:01:27 2007
+++ libmysequoia/ldtest/plugin.c        Tue Apr 17 11:06:04 2007
@@ -1,8 +1,11 @@
 
+extern "C" {
+  int intercepted();
+  int orig_calling_intercepted();
 
-int intercepted();
-int orig_calling_intercepted();
-
+  int plugin_intercepted();
+  int plugin_orig_calling_intercepted();
+}
 
 int plugin_intercepted()
 {

_______________________________________________
Carob-commits mailing list
Carob-commits@lists.forge.continuent.org
https://forge.continuent.org/mailman/listinfo/carob-commits