summaryrefslogtreecommitdiff
path: root/archivers/nulib2/patches/patch-ae
blob: e3b17f40f89c77bdb025067b3b7c90c83aeeb62b (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
$NetBSD: patch-ae,v 1.4 2014/09/13 11:10:58 shattered Exp $

- don't declare "kNufxLibName" extern as it's file-static in one source file
- fix gcc/C99 inline mess

--- nufxlib-220/NufxLibPriv.h.orig	2004-03-10 21:05:39.000000000 +0000
+++ nufxlib-220/NufxLibPriv.h
@@ -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);
@@ -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);