Ticket #29372: szip-source-differences.diff

szip-2.1/HISTORY.txt

@@ -1 +1 @@
 This file contains history of SZIP library releases
 
+%%%%%SZIP 2.1%%%%%
+
+                      Relase notes for SZIP 2.1
+                          November 10, 2008
+
+
+Bug fixes:
+
+   -- Modified a test in a configure script forcing to perform 
+      a real calculation to determine if math library is needed.
+
+New features:
+
+   -- None.
+
+Know problems:
+
+   -- On IRIX64-6.5, shared library version 3.0 is created instead of 2.0.
+   -- There is no support for shared library on the AIX 5.* systems.
+
+User support:
+    Report all problems to help@hdfgroup.org.
+    For more information on SZIP, see:
+        http://www.hdfgroup.org/doc_resource/SZIP/
+
+
 %%%%%SZIP 2.0%%%%%
                       Relase notes for SZIP 2.0
                           February, 2005

szip-2.1/RELEASE.txt

@@ -1 +1 @@
 
                       Relase notes for SZIP 2.1
-                          November 10, 2008
+                          July 14, 2010
 
 
 Bug fixes:
 
-   -- Modified a test in a configure script forcing to perform 
-      a real calculation to determine if math library is needed.
+   -- None.
 
 New features:
 
-   -- None.
+   -- CMake support added, which allows for shared or static builds.
 
 Know problems:
 

szip-2.1/src/szip_adpt.h

@@ -7 +7 @@
 #ifndef SZAPI_ADPT_H
 #define SZAPI_ADPT_H
 
+/* This will only be defined if szip was built with CMake shared libs*/
+#ifdef SZ_BUILT_AS_DYNAMIC_LIB
+
+#if defined (szip_EXPORTS)
+  #define _SZDLL_
+  #if defined (_MSC_VER)  /* MSVC Compiler Case */
+    #define __SZ_DLL__ __declspec(dllexport)
+/*    #define __DLLVARH425__ __declspec(dllexport)*/
+  #elif (__GNUC__ >= 4)  /* GCC 4.x has support for visibility options */
+    #define __SZ_DLL__ __attribute__ ((visibility("default")))
+/*    #define __DLLVARH425__ extern __attribute__ ((visibility("default"))) */
+  #endif
+#else
+  #define _SZUSEDLL_
+  #if defined (_MSC_VER)  /* MSVC Compiler Case */
+    #define __SZ_DLL__ __declspec(dllimport)
+/*    #define __DLLVARH425__ __declspec(dllimport)*/
+  #elif (__GNUC__ >= 4)  /* GCC 4.x has support for visibility options */
+    #define __SZ_DLL__ __attribute__ ((visibility("default")))
+/*    #define __DLLVARH425__ extern __attribute__ ((visibility("default"))) */
+  #endif
+#endif
+
+#else /* SZ_BUILT_AS_DYNAMIC_LIB */
+/* This is the original HDFGroup defined preprocessor code */
+
 #if defined(WIN32) && !defined(__MWERKS__)
 #if defined(_SZDLL_)
 #pragma warning(disable: 4273)  /* Disable the dll linkage warnings */
@@ -25 +51 @@
 /*#define __DLLVAR__ extern*/
 #endif
 
+#endif /* SZ_BUILT_AS_DYNAMIC_LIB */
+
 #endif /* H5API_ADPT_H */