diff options
Diffstat (limited to 'net/amule')
| -rw-r--r-- | net/amule/distinfo | 4 | ||||
| -rw-r--r-- | net/amule/patches/patch-ab | 38 |
2 files changed, 27 insertions, 15 deletions
diff --git a/net/amule/distinfo b/net/amule/distinfo index a285f0606ab..fb1bfae060f 100644 --- a/net/amule/distinfo +++ b/net/amule/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.7 2005/03/16 19:06:10 rillig Exp $ +$NetBSD: distinfo,v 1.8 2005/04/13 18:12:55 rillig Exp $ SHA1 (aMule-1.2.8.tar.bz2) = fac6f73f5068b326f45e08cded3b81af329c4226 RMD160 (aMule-1.2.8.tar.bz2) = 2cc882013f88f35f8f925fa8423ea9e2d8b33ac1 Size (aMule-1.2.8.tar.bz2) = 2039251 bytes SHA1 (patch-aa) = eba9455414a26dcd3cc81c6d7847d86e02dc9eb3 -SHA1 (patch-ab) = c38a9a4e7f927b7395ff8a40786c6eca3f248300 +SHA1 (patch-ab) = 72d0129b5962f0793c2f2a25a092a8bcb2191128 diff --git a/net/amule/patches/patch-ab b/net/amule/patches/patch-ab index 11652261fc4..e2cb47b88a1 100644 --- a/net/amule/patches/patch-ab +++ b/net/amule/patches/patch-ab @@ -1,21 +1,33 @@ -$NetBSD: patch-ab,v 1.3 2005/03/16 19:06:10 rillig Exp $ +$NetBSD: patch-ab,v 1.4 2005/04/13 18:12:55 rillig Exp $ -The C++ standard library headers sometimes include <_G_config.h>, which -undefines the NULL macro and includes <stddef.h> afterwards. But if the -<stddef.h> header had been included once before, the GNU C preprocessor -doesn't include it a second time. +The C++ standard library headers shipped with gcc-2.95 sometimes include +<_G_config.h>, which undefines the NULL macro and then includes +<stddef.h> afterwards. Currently the situation is: ---- src/sys.h.orig Sun Jun 13 17:37:06 2004 -+++ src/sys.h Wed Mar 16 19:40:44 2005 -@@ -23,6 +23,11 @@ - #ifndef SYS_H - #define SYS_H + #include <stddef.h> /* defines NULL */ + #include <_G_config.h> /* undefines NULL */ + # include <stddef.h> /* is skipped (guarded) */ + => NULL is undefined. + +So we need to include <_G_config.h> at the very beginning. Then the +sequence is: + + #include <_G_config.h> /* undefines NULL */ + # include <stddef.h> /* defines NULL */ + #include <_G_config.h> /* is skipped (guarded) */ + => NULL is defined. + +--- src/sys.h.in.orig Sun Jun 13 16:50:10 2004 ++++ src/sys.h.in Tue Apr 12 11:53:19 2005 +@@ -40,6 +40,11 @@ + #define _THREAD_SAFE + #endif +/* This is needed to have a NULL macro */ +#if defined(__NetBSD__) && defined(__GNUC__) && ((__GNUC__) < 3) +# include <stl_config.h> +#endif + - // - // The build system forgets to add the correct CXXFLAGS (like for - // example -pthread for g++). Therefore define this here instead. + #ifndef __linux__ + #include <sys/types.h> + #endif |