libextractor

commit 0d6f5a2330b532f28062300463a6d42cd3511d79
parent 2df6a62f92bd6fcc96bfe4da72b7162d67082bf1
Author: Christian Grothoff <christian@grothoff.org>
Date:   Wed, 26 Apr 2006 18:39:54 +0000

openbsd fixes

Diffstat:
M
PLATFORMS
 | 
10
+++++++++-
M
src/main/Makefile.am
 | 
2
++
M
src/plugins/exiv2/types.hpp
 | 
6
+++---
M
src/plugins/tarextractor.c
 | 
4
++++

4 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/PLATFORMS b/PLATFORMS
@@ -13,7 +13,15 @@ GNU/Linux (Alpha):
 FreeBSD (x86):
 - perfect
 
-OpenBSD/NetBSD:
+OpenBSD 3.8:
+- Chan Siu Ming <namely_void@yahoo.co.uk> 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):
diff --git a/src/main/Makefile.am b/src/main/Makefile.am
@@ -20,8 +20,10 @@ extract_LDADD = \
   $(top_builddir)/src/main/libextractor.la 
 
 if !MINGW
+if !SOMEBSD
   dlflag=-ldl
 endif
+endif
 
 if HAVE_ZLIB
   zlib =-lz
diff --git a/src/plugins/exiv2/types.hpp b/src/plugins/exiv2/types.hpp
@@ -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;
diff --git a/src/plugins/tarextractor.c b/src/plugins/tarextractor.c
@@ -194,6 +194,10 @@ tar_octalvalue(const char *data,
    return result;
 }
 
+#ifndef EOVERFLOW
+#define EOVERFLOW -1
+#endif
+
 static int
 tar_time(long long timeval,
          char *rtime,