Merge pull request #46 from bgilbert/windows

Windows build fixes

Author: jcupitt

include/dicom/dicom.h

@@ -13,7 +13,9 @@ typedef SSIZE_T ssize_t;
 #endif
 
 #ifdef _WIN32
-#ifdef BUILDING_LIBDICOM
+#if DCM_STATIC
+#define DCM_EXTERN extern
+#elif defined(BUILDING_LIBDICOM)
 #define DCM_EXTERN __declspec(dllexport) extern
 #else
 #define DCM_EXTERN __declspec(dllimport) extern

include/dicom/version.h.in

@@ -15,6 +15,10 @@
 #define DCM_ABI_VERSION_MINOR  (@DCM_ABI_VERSION_MINOR@)
 #define DCM_ABI_VERSION_PATCH  (@DCM_ABI_VERSION_PATCH@)
 
+/* Whether libdicom is built statically.
+ */
+#define DCM_STATIC             (@DCM_STATIC@)
+
 #endif /*DCM_VERSION_H*/
 
 

meson.build

@@ -57,6 +57,7 @@ version_data.set('DCM_VERSION_MICRO', version_patch)
 version_data.set('DCM_ABI_VERSION_MAJOR', abi_version_major)
 version_data.set('DCM_ABI_VERSION_MINOR', abi_version_minor)
 version_data.set('DCM_ABI_VERSION_PATCH', abi_version_patch)
+version_data.set10('DCM_STATIC', get_option('default_library') == 'static')
 
 # dependencies
 cc = meson.get_compiler('c')

src/dicom-io.c

@@ -10,6 +10,7 @@
 #define _CRT_NONSTDC_NO_DEPRECATE
 // and deprecates strdup
 #define strdup(v) _strdup(v)
+#include <share.h>
 #endif
 
 #include <assert.h>