diff options
| author | David E. O'Brien <obrien@FreeBSD.org> | 2008-09-01 17:56:05 +0000 |
|---|---|---|
| committer | David E. O'Brien <obrien@FreeBSD.org> | 2008-09-01 17:56:05 +0000 |
| commit | 1348e3ff59552fef1dca022dffb19f56bf70093e (patch) | |
| tree | 1d028adc594e4c491bbf5b4414d303eeb820f33d /security/pgp6/files/patch-aq | |
| parent | make it use gcc 4.2 or above instead of 4.1 only. (diff) | |
Fix build on FreeBSD/i386 8-CURRENT. (7.0 building with GCC 4.2)
Notes
Notes:
svn path=/head/; revision=219602
Diffstat (limited to 'security/pgp6/files/patch-aq')
| -rw-r--r-- | security/pgp6/files/patch-aq | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/security/pgp6/files/patch-aq b/security/pgp6/files/patch-aq index 693baa04b11c..ab27c1c51609 100644 --- a/security/pgp6/files/patch-aq +++ b/security/pgp6/files/patch-aq @@ -1,15 +1,11 @@ -*** libs/network/ldaplib/include/ldap.h 2000/01/26 03:10:31 1.1.1.1 ---- libs/network/ldaplib/include/ldap.h 2000/01/26 03:12:53 1.1.1.2 -*************** -*** 90,95 **** ---- 90,99 ---- - #define GetThreadID pthread_self - #endif - -+ #ifdef __FreeBSD__ -+ #define GetThreadID pthread_self -+ #endif -+ - #if PGP_MACINTOSH - #define Debug( level, fmt, arg1, arg2, arg3 ) {} /* Nothing */ - #else +--- libs/network/ldaplib/include/ldap.h.orig 1999-08-04 11:35:42.000000000 -0700 ++++ libs/network/ldaplib/include/ldap.h 2008-08-31 00:47:21.000000000 -0700 +@@ -86,7 +86,7 @@ extern __declspec(dllimport) unsigned lo + #define GetThreadID GetCurrentThreadId + #elif PGP_UNIX_SOLARIS + #define GetThreadID thr_self +-#elif PGP_UNIX_LINUX || PGP_UNIX_AIX || PGP_UNIX_HPUX ++#elif PGP_UNIX_LINUX || PGP_UNIX_AIX || PGP_UNIX_HPUX || defined(__FreeBSD__) + /* This is for all pthreads systems, including Linux and AIX. */ + #define GetThreadID pthread_self + #endif |