diff options
| author | dholland <dholland@pkgsrc.org> | 2011-09-03 21:39:09 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2011-09-03 21:39:09 +0000 |
| commit | 5c43269790b711e344ad926617fe729364401129 (patch) | |
| tree | 0a9ceaee0e198652793c312b6e2aae4e900624ae /archivers | |
| parent | 588353b17df7a7fee2cbc8d3f93cefc614a52766 (diff) | |
| download | pkgsrc-5c43269790b711e344ad926617fe729364401129.tar.gz | |
Fix gcc/c99 inline mess.
Diffstat (limited to 'archivers')
| -rw-r--r-- | archivers/nulib2/distinfo | 4 | ||||
| -rw-r--r-- | archivers/nulib2/patches/patch-ae | 33 |
2 files changed, 32 insertions, 5 deletions
diff --git a/archivers/nulib2/distinfo b/archivers/nulib2/distinfo index d1e28e41b74..c03196ccf77 100644 --- a/archivers/nulib2/distinfo +++ b/archivers/nulib2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2009/02/10 00:01:55 joerg Exp $ +$NetBSD: distinfo,v 1.11 2011/09/03 21:39:09 dholland Exp $ SHA1 (nulibdist-203.tar.gz) = c7a9bde218e0a115424dfc2e3d7234ee7faa9b8e RMD160 (nulibdist-203.tar.gz) = 84c6eadd64749cfdc11fda74a552072bce1b04db @@ -7,5 +7,5 @@ SHA1 (patch-aa) = a8c05f177ec5e08dc1bb8968be3febb3586d57a1 SHA1 (patch-ab) = fe70386516a18837589986143d4c0fbdd1082baa SHA1 (patch-ac) = 51460a4003c40f68ed19431afc02aa1607f482ef SHA1 (patch-ad) = e537bbc19b3edfbabac1e61859dca29b068c36e5 -SHA1 (patch-ae) = 053d302021ea898ae72fc78e69f52660b82989ab +SHA1 (patch-ae) = 18890ec7d754060abfe8dee37ed9cb8ab58eb139 SHA1 (patch-af) = 681d4d1a66a70c879b85377c1b86fd2fa60666d8 diff --git a/archivers/nulib2/patches/patch-ae b/archivers/nulib2/patches/patch-ae index 832387dbba8..6a7daef8ee3 100644 --- a/archivers/nulib2/patches/patch-ae +++ b/archivers/nulib2/patches/patch-ae @@ -1,8 +1,23 @@ -$NetBSD: patch-ae,v 1.1 2005/10/31 05:34:07 minskim Exp $ +$NetBSD: patch-ae,v 1.2 2011/09/03 21:39:09 dholland Exp $ ---- ../nufxlib-203/NufxLibPriv.h.orig 2004-03-10 13:05:39.000000000 -0800 +- don't declare "kNufxLibName" extern as it's file-static in one source file +- fix gcc/C99 inline mess + +--- ../nufxlib-203/NufxLibPriv.h.orig 2004-03-10 21:05:39.000000000 +0000 +++ ../nufxlib-203/NufxLibPriv.h -@@ -673,7 +673,6 @@ NuError Nu_ExpandLZW(NuArchive* pArchive +@@ -557,7 +557,11 @@ ushort Nu_CalcCRC16(ushort seed, const u + #ifdef __Crc16_c__ /* just doing "static inline" warns def-but-not-used */ + #define CRC_INLINE /**/ + #else ++#if defined(__GNUC__) && !defined(__GNUC_STDC_INLINE__) + #define CRC_INLINE extern inline ++#else ++ #define CRC_INLINE inline ++#endif + #endif + #if defined(inline) && !defined(__Crc16_c__) /* somebody ovrd inline def? */ + ushort Nu_UpdateCRC16(uchar val, ushort crc); +@@ -673,7 +677,6 @@ NuError Nu_ExpandLZW(NuArchive* pArchive const NuThread* pThread, FILE* infp, NuFunnel* pFunnel, ushort* pThreadCrc); /* MiscUtils.c */ @@ -10,3 +25,15 @@ $NetBSD: patch-ae,v 1.1 2005/10/31 05:34:07 minskim Exp $ extern NuCallback gNuGlobalErrorMessageHandler; const char* Nu_StrError(NuError err); void Nu_ReportError(NuArchive* pArchive, const char* file, int line, +@@ -811,7 +814,11 @@ NuError Nu_ExpandHuffmanSQ(NuArchive* pA + #ifdef __Thread_c__ + #define THREAD_INLINE /**/ + #else ++#if defined(__GNUC__) && !defined(__GNUC_STDC_INLINE__) + #define THREAD_INLINE extern inline ++#else ++ #define THREAD_INLINE inline ++#endif + #endif + #if defined(inline) && !defined(__Thread_c__) /* somebody ovrd inline def? */ + NuThread* Nu_GetThread(const NuRecord* pRecord, int idx); |