extern "C"

 (.)

diff --git a/ChangeLog b/ChangeLog
index f0b5d2fa74e7eadb0c856c96e87ca6b53e00954b..c7b9b05c5ac43d98000d4d04b7c52adf8d86f5e2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2008-08-14
  * Yvan Phelizot reports a problem in zzip/mmapped.c
+ * Malcom MacLeod had spurious problems inside a C++ project,
+       so let's update all heraders with explicit 'extern "C"' linkage.
 
 2006-08-08
  * rephrase build system, automated tests, some doc parts

diff --git a/zzip/fetch.h b/zzip/fetch.h
index fda6f9067e645f606487e181a3b301ed8d49fb1b..e2c5e9b6a018c3d9e74679810ba3505c85cab6ee 100644 (file)
--- a/zzip/fetch.h
+++ b/zzip/fetch.h
@@ -10,6 +10,10 @@
 #include <byteswap.h>
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* get 16/32 bits from little-endian zip-file to host byteorder */
 extern uint32_t __zzip_get32(zzip_byte_t * s) __zzip_attribute__((const));
 extern uint16_t __zzip_get16(zzip_byte_t * s) __zzip_attribute__((const));
@@ -340,4 +344,7 @@ extern void     __zzip_set64(zzip_byte_t * s, uint64_t v);
         (zzip_disk_entry_data_deflated(__p) && \
         zzip_disk_entry_data_comprlevel(__p) == ZZIP_DEFLATED_MIN_COMPR)
 
+#ifdef __cplusplus
+}
+#endif
 #endif

diff --git a/zzip/fseeko.h b/zzip/fseeko.h
index cbe40f7db4afc2802428b0e5c1131efad47b2713..e406c1b1ed6847cd527e9db90b8f7d3cdd8b53ad 100644 (file)
--- a/zzip/fseeko.h
+++ b/zzip/fseeko.h
@@ -20,6 +20,10 @@
 #include <zzip/types.h>
 #include <stdio.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct zzip_entry ZZIP_ENTRY;
 typedef struct zzip_entry_file ZZIP_ENTRY_FILE;
 
@@ -112,5 +116,8 @@ struct zzip_entry /* : struct zzip_disk_entry */
 #  endif /* __cplusplus */
 # endif /* _ZZIP_MEM_ENTRY_PRIVATE */
 
+#ifdef __cplusplus
+extern "C" {
+}
 #endif
 

diff --git a/zzip/lib.h b/zzip/lib.h
index b1ad06900421610cf24d6d0ec350b779a8dea101..e533183d4a0c4330b077c0272a5e714308924eba 100644 (file)
--- a/zzip/lib.h
+++ b/zzip/lib.h
@@ -22,6 +22,10 @@
 #include <zzip/plugin.h>
 #include <zzip/stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  * this structure cannot be wildly enlarged... (see zzip-zip.c)
  */
@@ -79,5 +83,8 @@ zzip_dir_fdopen_ext_io(int fd, zzip_error_t * errorcode_p,
 ZZIP_DIR* /*depracated*/
 zzip_dir_alloc_ext_io (zzip_strings_t* ext, const zzip_plugin_io_t io);
 
+#ifdef __cplusplus
+}
+#endif
 #endif /* _ZZIP_H */
 

diff --git a/zzip/memdisk.h b/zzip/memdisk.h
index 4403282f7306b122f3e4523614eb580cca28f75a..32d243ca37df64eeaf57a7e406a27893c2f1c927 100644 (file)
--- a/zzip/memdisk.h
+++ b/zzip/memdisk.h
@@ -6,6 +6,10 @@
 #include <zzip/types.h>
 #include <zzip/mmapped.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct _zzip_mem_disk ZZIP_MEM_DISK;
 typedef struct _zzip_mem_entry ZZIP_MEM_ENTRY;
 
@@ -159,4 +163,7 @@ zzip_mem_disk_feof (ZZIP_MEM_DISK_FILE* file);
 /* convert dostime of entry to unix time_t */
 long zzip_disk_entry_get_mktime(ZZIP_DISK_ENTRY* entry);
 
+#ifdef __cplusplus
+}
+#endif
 #endif

diff --git a/zzip/mmapped.h b/zzip/mmapped.h
index 5f434544800b945be3cd735000571484353d965b..951602abb859492f3ce8b7dd00a48f02016dac29 100644 (file)
--- a/zzip/mmapped.h
+++ b/zzip/mmapped.h
@@ -19,6 +19,10 @@
 
 #include <zzip/types.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct zzip_disk_file  ZZIP_DISK_FILE;
 typedef struct zzip_disk       ZZIP_DISK;
 /*  def struct zzip_disk_entry ZZIP_DISK_ENTRY; */
@@ -116,5 +120,8 @@ struct zzip_disk_file
 };
 #endif
 
+#ifdef __cplusplus
+}
+#endif
 #endif
 

diff --git a/zziplib.spec b/zziplib.spec
index 55e92649cd104dfbf65b4e6fcba50fc43245e975..58f02b634eb876352b71f8e41b9f1a7bb6bb5e16 100644 (file)
--- a/zziplib.spec
+++ b/zziplib.spec
@@ -1,7 +1,7 @@
 %define lib   lib010
 Summary:      ZZipLib - libZ-based ZIP-access Library
 Name:         zziplib
-Version:      0.13.47
+Version:      0.13.48
 Release:      1.suse100
 Serial:       1
 Copyright:    LGPL