[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=4a23d9d

The following commit has been merged in the master branch:
commit 4a23d9d65282df8ebb1e625e289645c94a106bca
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun Sep 5 15:07:16 2004 +0000

    Updated win32 configuration
---
 src/actions.cpp | 14 ++++++++++----
 src/exiv2.cpp   | 12 +++++++++---
 src/image.cpp   | 22 ++++++++++++++--------
 src/utils.cpp   | 20 +++++++++++++-------
 4 files changed, 46 insertions(+), 22 deletions(-)

diff --git a/src/actions.cpp b/src/actions.cpp
index 62086f6..57aef60 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -20,17 +20,23 @@
  */
 /*
   File:      actions.cpp
-  Version:   $Name:  $ $Revision: 1.35 $
+  Version:   $Name:  $ $Revision: 1.36 $
   Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
   History:   08-Dec-03, ahu: created
  */
 // *****************************************************************************
 #include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.35 $ $RCSfile: actions.cpp,v $");
+EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.36 $ $RCSfile: actions.cpp,v $");
 
 // *****************************************************************************
 // included header files
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#else
+# ifdef _MSC_VER
+#  include <config_win32.h>
+# endif
+#endif
 
 #include "actions.hpp"
 #include "exiv2.hpp"
@@ -55,7 +61,7 @@ EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.35 $ $RCSfile: actions.cpp,v $");
 #include <cmath>
 #include <sys/types.h>                  // for stat()
 #include <sys/stat.h>                   // for stat()
-#if defined HAVE_UNISTD_H && !defined _MSC_VER
+#ifdef HAVE_UNISTD_H
 # include <unistd.h>                    // for stat()
 #endif
 
diff --git a/src/exiv2.cpp b/src/exiv2.cpp
index c8cf5c9..c42bd1a 100644
--- a/src/exiv2.cpp
+++ b/src/exiv2.cpp
@@ -22,17 +22,23 @@
   Abstract:  Command line program to display and manipulate image %Exif data
 
   File:      exiv2.cpp
-  Version:   $Name:  $ $Revision: 1.13 $
+  Version:   $Name:  $ $Revision: 1.14 $
   Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
   History:   10-Dec-03, ahu: created
  */
 // *****************************************************************************
 #include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.13 $ $RCSfile: exiv2.cpp,v $");
+EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.14 $ $RCSfile: exiv2.cpp,v $");
 
 // *****************************************************************************
 // included header files
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#else
+# ifdef _MSC_VER
+#  include <config_win32.h>
+# endif
+#endif
 
 #include "exiv2.hpp"
 #include "actions.hpp"
diff --git a/src/image.cpp b/src/image.cpp
index ceedae6..fd841af 100644
--- a/src/image.cpp
+++ b/src/image.cpp
@@ -20,7 +20,7 @@
  */
 /*
   File:      image.cpp
-  Version:   $Name:  $ $Revision: 1.24 $
+  Version:   $Name:  $ $Revision: 1.25 $
   Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
              Brad Schick (brad) <schick at robotbattle.com>
   History:   26-Jan-04, ahu: created
@@ -29,11 +29,17 @@
  */
 // *****************************************************************************
 #include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.24 $ $RCSfile: image.cpp,v $");
+EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.25 $ $RCSfile: image.cpp,v $");
 
 // *****************************************************************************
 // included header files
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#else
+# ifdef _MSC_VER
+#  include <config_win32.h>
+# endif
+#endif
 
 #include "image.hpp"
 #include "types.hpp"
@@ -47,12 +53,12 @@ EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.24 $ $RCSfile: image.cpp,v $");
 #include <sys/stat.h>
 #ifdef _MSC_VER
 # define S_ISREG(m)      (((m) & S_IFMT) == S_IFREG)
+#endif
+#ifdef HAVE_PROCESS_H
 # include <process.h>
-  typedef int pid_t;
-#else
-# ifdef HAVE_UNISTD_H
-#  include <unistd.h>                           // for getpid, stat
-# endif
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>                            // for getpid, stat
 #endif
 
 // *****************************************************************************
diff --git a/src/utils.cpp b/src/utils.cpp
index 1e69e64..c5b7b3a 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -20,17 +20,24 @@
  */
 /*
   File:      utils.cpp
-  Version:   $Name:  $ $Revision: 1.10 $
+  Version:   $Name:  $ $Revision: 1.11 $
   Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
   History:   08-Dec-03, ahu: created
  */
 // *****************************************************************************
 #include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.10 $ $RCSfile: utils.cpp,v $");
+EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.11 $ $RCSfile: utils.cpp,v $");
 
 // *****************************************************************************
 // included header files
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#else
+# ifdef _MSC_VER
+#  include <config_win32.h>
+# endif
+#endif
+
 #include "utils.hpp"
 
 // + standard includes
@@ -39,10 +46,9 @@ EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.10 $ $RCSfile: utils.cpp,v $");
 #ifdef _MSC_VER
 # include "getopt_win32.h"
 # define S_ISREG(m)      (((m) & S_IFMT) == S_IFREG)
-#else
-# ifdef HAVE_UNISTD_H
-#  include <unistd.h>                     // for getopt(), stat()
-# endif
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>                     // for getopt(), stat()
 #endif
 #include <errno.h>
 

-- 
exiv2 packaging