[GNUnet-SVN] r2666 - in Extractor: . src/main src/plugins src/plugins/exiv2

[grothoff]

Author: grothoff
Date: 2006-04-26 11:39:54 -0700 (Wed, 26 Apr 2006)
New Revision: 2666

Modified:
   Extractor/PLATFORMS
   Extractor/src/main/Makefile.am
   Extractor/src/plugins/exiv2/types.hpp
   Extractor/src/plugins/tarextractor.c
Log:
openbsd fixes

Modified: Extractor/PLATFORMS
===================================================================
--- Extractor/PLATFORMS 2006-04-26 18:22:47 UTC (rev 2665)
+++ Extractor/PLATFORMS 2006-04-26 18:39:54 UTC (rev 2666)
@@ -13,7 +13,15 @@
 FreeBSD (x86):
 - perfect
 
-OpenBSD/NetBSD:
+OpenBSD 3.8:
+- Chan Siu Ming <address@hidden> writes:
+  - libtool is good to have
+  - OpenBSD 3.8 also doesn't have CODESET in langinfo.h (used in about three 
places.) I'm not sure how to cleanly overcome this.
+  - for some reason, convert.a is linked with a static version of libiconv.a, 
so that convert.a ends up containing convert.o 
+    and libiconv.a, which confuses the linker, because archives aren't 
supposed to contain other archives. Removed the ICONV 
+    stuff from convert_la_LDFLAGS in some Makefiles and it seemed to get past 
that.
+
+- NetBSD:
 - unknown
 
 OS X (10.3, PowerPC):

Modified: Extractor/src/main/Makefile.am
===================================================================
--- Extractor/src/main/Makefile.am      2006-04-26 18:22:47 UTC (rev 2665)
+++ Extractor/src/main/Makefile.am      2006-04-26 18:39:54 UTC (rev 2666)
@@ -20,8 +20,10 @@
   $(top_builddir)/src/main/libextractor.la 
 
 if !MINGW
+if !SOMEBSD
   dlflag=-ldl
 endif
+endif
 
 if HAVE_ZLIB
   zlib =-lz

Modified: Extractor/src/plugins/exiv2/types.hpp
===================================================================
--- Extractor/src/plugins/exiv2/types.hpp       2006-04-26 18:22:47 UTC (rev 
2665)
+++ Extractor/src/plugins/exiv2/types.hpp       2006-04-26 18:39:54 UTC (rev 
2666)
@@ -33,7 +33,7 @@
 
 // 
*****************************************************************************
 // included header files
-#ifdef _MSC_VER
+#if _MSC_VER
 # include "exv_msvc.h"
 #else
 # include "exv_conf.h"
@@ -45,12 +45,12 @@
 #include <utility>
 #include <sstream>
 #include <cstdio>
-#ifdef EXV_HAVE_STDINT_H
+#if EXV_HAVE_STDINT_H
 # include <stdint.h>
 #endif
 
 // MSVC doesn't provide C99 types, but it has MS specific variants
-#ifdef _MSC_VER
+#if _MSC_VER
 typedef unsigned __int8  uint8_t;
 typedef unsigned __int16 uint16_t;
 typedef unsigned __int32 uint32_t;

Modified: Extractor/src/plugins/tarextractor.c
===================================================================
--- Extractor/src/plugins/tarextractor.c        2006-04-26 18:22:47 UTC (rev 
2665)
+++ Extractor/src/plugins/tarextractor.c        2006-04-26 18:39:54 UTC (rev 
2666)
@@ -194,6 +194,10 @@
    return result;
 }
 
+#ifndef EOVERFLOW
+#define EOVERFLOW -1
+#endif
+
 static int
 tar_time(long long timeval,
          char *rtime,