diff options
author | joerg <joerg@pkgsrc.org> | 2013-03-03 01:07:54 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2013-03-03 01:07:54 +0000 |
commit | b20a727dd0f5dda0c0d158ea18b74a8ea3c06046 (patch) | |
tree | e8dcda31ecd88cd9eb97c75a67dd40ead0cd5c24 /net | |
parent | 3173f7da5a04d870483a7bfc106e17f15c6cd473 (diff) | |
download | pkgsrc-b20a727dd0f5dda0c0d158ea18b74a8ea3c06046.tar.gz |
Be explicit and consistent in the visiblity of globalMemTrace.
Diffstat (limited to 'net')
-rw-r--r-- | net/ns/distinfo | 5 | ||||
-rw-r--r-- | net/ns/patches/patch-common_scheduler.cc | 25 | ||||
-rw-r--r-- | net/ns/patches/patch-common_tclAppInit.cc | 22 | ||||
-rw-r--r-- | net/ns/patches/patch-common_tkAppInit.cc | 22 |
4 files changed, 73 insertions, 1 deletions
diff --git a/net/ns/distinfo b/net/ns/distinfo index e169ecc2abf..9304d4bf113 100644 --- a/net/ns/distinfo +++ b/net/ns/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.18 2012/12/15 22:07:32 markd Exp $ +$NetBSD: distinfo,v 1.19 2013/03/03 01:07:54 joerg Exp $ SHA1 (ns-src-2.35.tar.gz) = 785d4045711d92c0042a6f8f5620d5eb74732980 RMD160 (ns-src-2.35.tar.gz) = 197e6874b97c56819ce9a722ffab9fe80a5cfe21 @@ -21,5 +21,8 @@ SHA1 (patch-aq) = c46339a81f3f0dea9754f733d567c3c93f7dc19e SHA1 (patch-common_packet.cc) = 74835d281febc195c5d1118bc5ceb40107597876 SHA1 (patch-common_packet.h) = 2b8289ee47206f7201ea225d23318202c7b370c5 SHA1 (patch-common_ptypes2tcl.cc) = 2354e030fef92d28c2c4049be30dcb365302068a +SHA1 (patch-common_scheduler.cc) = 9fc226aa15a50880b09b97c99b9778e7c230d4da +SHA1 (patch-common_tclAppInit.cc) = a96791d7a4cdf9834fa2e3bf994903944f41b011 +SHA1 (patch-common_tkAppInit.cc) = c4f5bfa97a1585773443044640dac343219a4155 SHA1 (patch-linkstate_ls.h) = 5f0fb99db398cf39e9853e7d8e8cd6536d29e44b SHA1 (patch-mac_mac-802_11Exr.cc) = 93e4112025b6e610e76694c6067723f77cd75b84 diff --git a/net/ns/patches/patch-common_scheduler.cc b/net/ns/patches/patch-common_scheduler.cc new file mode 100644 index 00000000000..4d598300f2e --- /dev/null +++ b/net/ns/patches/patch-common_scheduler.cc @@ -0,0 +1,25 @@ +$NetBSD: patch-common_scheduler.cc,v 1.1 2013/03/03 01:07:54 joerg Exp $ + +--- common/scheduler.cc.orig 2013-03-02 23:41:43.000000000 +0000 ++++ common/scheduler.cc +@@ -185,6 +185,12 @@ Scheduler::reset() + clock_ = SCHED_START; + } + ++#ifdef MEMDEBUG_SIMULATIONS ++extern "C++" { ++ extern MemTrace *globalMemTrace; ++} ++#endif ++ + int + Scheduler::command(int argc, const char*const* argv) + { +@@ -211,7 +217,6 @@ Scheduler::command(int argc, const char* + + } else if (strcmp(argv[1], "clearMemTrace") == 0) { + #ifdef MEMDEBUG_SIMULATIONS +- extern MemTrace *globalMemTrace; + if (globalMemTrace) + globalMemTrace->diff("Sim."); + #endif diff --git a/net/ns/patches/patch-common_tclAppInit.cc b/net/ns/patches/patch-common_tclAppInit.cc new file mode 100644 index 00000000000..54998e6cdcd --- /dev/null +++ b/net/ns/patches/patch-common_tclAppInit.cc @@ -0,0 +1,22 @@ +$NetBSD: patch-common_tclAppInit.cc,v 1.1 2013/03/03 01:07:54 joerg Exp $ + +--- common/tclAppInit.cc.orig 2013-03-02 23:41:45.000000000 +0000 ++++ common/tclAppInit.cc +@@ -23,7 +23,9 @@ extern EmbeddedTcl et_ns_ptypes; + /* MSVC requires this global var declaration to be outside of 'extern "C"' */ + #ifdef MEMDEBUG_SIMULATIONS + #include "mem-trace.h" ++extern "C++" { + MemTrace *globalMemTrace; ++} + #endif + + #define NS_BEGIN_EXTERN_C extern "C" { +@@ -237,7 +239,6 @@ int + Tcl_AppInit(Tcl_Interp *interp) + { + #ifdef MEMDEBUG_SIMULATIONS +- extern MemTrace *globalMemTrace; + globalMemTrace = new MemTrace; + #endif + diff --git a/net/ns/patches/patch-common_tkAppInit.cc b/net/ns/patches/patch-common_tkAppInit.cc new file mode 100644 index 00000000000..9a724459683 --- /dev/null +++ b/net/ns/patches/patch-common_tkAppInit.cc @@ -0,0 +1,22 @@ +$NetBSD: patch-common_tkAppInit.cc,v 1.1 2013/03/03 01:07:54 joerg Exp $ + +--- common/tkAppInit.cc.orig 2013-03-02 23:41:47.000000000 +0000 ++++ common/tkAppInit.cc +@@ -31,7 +31,9 @@ extern EmbeddedTcl et_tk; + /* MSVC requires this global var declaration to be outside of 'extern "C"' */ + #ifdef MEMDEBUG_SIMULATIONS + #include "mem-trace.h" ++extern "C++" { + MemTrace *globalMemTrace; ++} + #endif + + #define NS_BEGIN_EXTERN_C extern "C" { +@@ -293,7 +295,6 @@ int + Tcl_AppInit(Tcl_Interp *interp) + { + #ifdef MEMDEBUG_SIMULATIONS +- extern MemTrace *globalMemTrace; + globalMemTrace = new MemTrace; + #endif + |