From: malaterre <malaterre>
Date: Thu, 27 Oct 2005 20:43:53 +0000 (+0000)
Subject: ENH: Commit an old patch
X-Git-Tag: OpenJPEG.Version1.2~102
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=fc26fd51c7b6499f94075ccda151f3adbd072bcd;p=gdcm.git

ENH: Commit an old patch
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 316955d5..14ba182f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -132,8 +132,9 @@ CHECK_INCLUDE_FILE("stdint.h"       CMAKE_HAVE_STDINT_H)
 IF(UNIX) #Avoid polluting Win32 cmakecache
   CHECK_INCLUDE_FILE("inttypes.h"     CMAKE_HAVE_INTTYPES_H)
 ENDIF(UNIX)
-# Special JPR, don't know what he is doing...
+# Special Time support, two convention: *NIX vs Win32
 CHECK_INCLUDE_FILE("sys/times.h"     CMAKE_HAVE_SYS_TIMES_H)
+CHECK_INCLUDE_FILE("sys/timeb.h"     CMAKE_HAVE_SYS_TIMEB_H)
 
 # Check if header file exists and add it to the list.
 INCLUDE (${CMAKE_ROOT}/Modules/CheckIncludeFiles.cmake)
diff --git a/gdcmConfigure.h.in b/gdcmConfigure.h.in
index 3283168c..24a781ac 100644
--- a/gdcmConfigure.h.in
+++ b/gdcmConfigure.h.in
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmConfigure.h.in,v $
   Language:  C++
-  Date:      $Date: 2005/10/24 01:16:19 $
-  Version:   $Revision: 1.20 $
+  Date:      $Date: 2005/10/27 20:43:53 $
+  Version:   $Revision: 1.21 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -63,8 +63,9 @@
 
 #define GDCM_SIZEOF_LONG @GDCM_SIZEOF_LONG@
 
-/* Special JPR */
+/* Special time structure support */
 #cmakedefine CMAKE_HAVE_SYS_TIMES_H
+#cmakedefine CMAKE_HAVE_SYS_TIMEB_H
 
 /* GetMacAddress require a lot of include file to access low level API */
 #cmakedefine CMAKE_HAVE_UNISTD_H