ENH: Trying to write the worse hack ever...

diff --git a/src/gdcmmpeg2/src/mpeg2dec/CMakeLists.txt b/src/gdcmmpeg2/src/mpeg2dec/CMakeLists.txt
index e30205e9f7244b51ec34828bf49ac2a7a9db0881..5ca3699ca44fd88adfe38d5b26cc67adc86bfce8 100644 (file)
--- a/src/gdcmmpeg2/src/mpeg2dec/CMakeLists.txt
+++ b/src/gdcmmpeg2/src/mpeg2dec/CMakeLists.txt
@@ -18,11 +18,11 @@ SET(GDCM_MPEG2DEC_SOURCES
   #  verify.c
   )
 
-#ADD_LIBRARY(gdcmmpeg2 ${GDCM_MPEG2DEC_SOURCES} mpeg2dec.c)
-#IF(UNIX)
-#  TARGET_LINK_LIBRARIES(gdcmmpeg2 -lm)
-#ENDIF(UNIX)
+ADD_LIBRARY(gdcmmpeg2 ${GDCM_MPEG2DEC_SOURCES} mpeg2dec.c)
+IF(UNIX)
+  TARGET_LINK_LIBRARIES(gdcmmpeg2 -lm)
+ENDIF(UNIX)
 
 #ADD_DEFINITIONS(-DGDCM_BUILD_MPEG2DEC)
-ADD_EXECUTABLE(mpeg2decode ${GDCM_MPEG2DEC_SOURCES} mpeg2dec.c)
-TARGET_LINK_LIBRARIES(mpeg2decode -lm)
+#ADD_EXECUTABLE(mpeg2decode ${GDCM_MPEG2DEC_SOURCES} mpeg2dec.c)
+#TARGET_LINK_LIBRARIES(mpeg2decode -lm)

diff --git a/src/gdcmmpeg2/src/mpeg2dec/mpeg2dec.h b/src/gdcmmpeg2/src/mpeg2dec/mpeg2dec.h
index 9613e479d12a4ea32890981429eaac36dd17e39c..d6f06b947e7c1f166802f090e734390803204794 100644 (file)
--- a/src/gdcmmpeg2/src/mpeg2dec/mpeg2dec.h
+++ b/src/gdcmmpeg2/src/mpeg2dec/mpeg2dec.h
@@ -137,6 +137,7 @@ typedef int ssize_t;
 #define FILESTAR
 
 #include <stdio.h>
+#ifndef __cplusplus
 typedef struct
 {
 #ifdef FILESTAR
@@ -145,6 +146,7 @@ typedef struct
   int InFd;
 #endif
 } istream;
+#endif
 
 typedef struct
 {