[Freeciv-Dev] Re: (PR#14654) Duplicate Defines in specvec.h

["Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

<URL: http://bugs.freeciv.org/Ticket/Display.html?id=14654 >

skips wrote:
> <URL: http://bugs.freeciv.org/Ticket/Display.html?id=14654 >
> 
> Compiling the Freeciv 2.0.7 code base with Apple's XCode 2.1  
> generates several hundred warnings about duplicate defines in  
> specvec.h.  Lines 69-82 appear to be duplicates of lines 48-60.   
> Commenting out lines 69-82 eliminates the warnings and appears to  
> generate usable code.  This problem affects both Freeciv server and  
> Freeciv client builds.

These patches should fix it.

-jason

Index: utility/specvec.h
===================================================================
--- utility/specvec.h   (revision 11256)
+++ utility/specvec.h   (working copy)
@@ -66,21 +66,6 @@
   size_t size, size_alloc;
 };
 
-#ifndef SPECVEC_TAG
-#error Must define a SPECVEC_TAG to use this header
-#endif
-
-#ifndef SPECVEC_TYPE
-#define SPECVEC_TYPE struct SPECVEC_TAG
-#endif
-
-#define SPECVEC_PASTE_(x,y) x ## y
-#define SPECVEC_PASTE(x,y) SPECVEC_PASTE_(x,y)
-
-#define SPECVEC_VECTOR struct SPECVEC_PASTE(SPECVEC_TAG, _vector)
-
-#define SPECVEC_FOO(suffix) SPECVEC_PASTE(SPECVEC_TAG, suffix)
-
 static inline void SPECVEC_FOO(_vector_init) (SPECVEC_VECTOR *tthis)
 {
   tthis->p = NULL;

Index: utility/specvec.h
===================================================================
--- utility/specvec.h   (revision 11256)
+++ utility/specvec.h   (working copy)
@@ -66,21 +66,6 @@
   size_t size, size_alloc;
 };
 
-#ifndef SPECVEC_TAG
-#error Must define a SPECVEC_TAG to use this header
-#endif
-
-#ifndef SPECVEC_TYPE
-#define SPECVEC_TYPE struct SPECVEC_TAG
-#endif
-
-#define SPECVEC_PASTE_(x,y) x ## y
-#define SPECVEC_PASTE(x,y) SPECVEC_PASTE_(x,y)
-
-#define SPECVEC_VECTOR struct SPECVEC_PASTE(SPECVEC_TAG, _vector)
-
-#define SPECVEC_FOO(suffix) SPECVEC_PASTE(SPECVEC_TAG, suffix)
-
 static inline void SPECVEC_FOO(_vector_init) (SPECVEC_VECTOR *tthis)
 {
   tthis->p = NULL;