[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=3c8ff8b

The following commit has been merged in the master branch:
commit 3c8ff8b00a9e4b844f6245990ed91f9bcb7ec211
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun Sep 12 15:22:51 2004 +0000

    Minor changes for MSVC
---
 src/getopt_win32.c |  7 +++++--
 src/localtime.c    | 10 ++++++++--
 src/private.h      | 13 ++++++++++++-
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/src/getopt_win32.c b/src/getopt_win32.c
index 5adc39a..d53b278 100644
--- a/src/getopt_win32.c
+++ b/src/getopt_win32.c
@@ -28,9 +28,12 @@
  #pragma alloca
 #endif
 
-
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include <config.h>
+#else
+# ifdef _MSC_VER
+#  include <config_win32.h>
+# endif
 #endif
 
 #ifdef __GNUC__
diff --git a/src/localtime.c b/src/localtime.c
index 12d533c..31ac004 100644
--- a/src/localtime.c
+++ b/src/localtime.c
@@ -1,9 +1,15 @@
 /*!
   @file    localtime.c
   @brief   This file is from the tz distribution at ftp://elsie.nci.nih.gov/pub/
-  @version $Name:  $ $Revision: 1.1 $
+  @version $Name:  $ $Revision: 1.2 $
 */
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#else
+# ifdef _MSC_VER
+#  include <config_win32.h>
+# endif
+#endif
 #include "timegm.h"
 
 /*
diff --git a/src/private.h b/src/private.h
index 8589adf..022a21f 100644
--- a/src/private.h
+++ b/src/private.h
@@ -1,7 +1,7 @@
 /*!
   @file    private.h
   @brief   This file is from the tz distribution at ftp://elsie.nci.nih.gov/pub/
-  @version $Name:  $ $Revision: 1.2 $
+  @version $Name:  $ $Revision: 1.3 $
 */
 #ifndef PRIVATE_H
 
@@ -32,6 +32,12 @@ static char	privatehid[] = "@(#)private.h	7.53";
 
 /* ahu: moved required preprocessor symbols to config.h */
 
+/* ahu: disable warnings */
+#ifdef _MSC_VER
+// disable warning 'uses old-style declarator' C4131
+#pragma warning (disable: 4131)
+#endif
+
 /*
 ** Nested includes
 */
@@ -44,6 +50,11 @@ static char	privatehid[] = "@(#)private.h	7.53";
 #include "time.h"
 #include "stdlib.h"
 
+/* ahu: added io.h for MSVC */
+#ifdef _MSC_VER
+# include "io.h"
+#endif
+
 /* ahu: deleted include libintl.h */
 
 /* ahu: deleted include sys/wait.h and WIFEXITED, WEXITSTATUS macros */

-- 
exiv2 packaging