[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=56f7b38

The following commit has been merged in the master branch:
commit 56f7b38689c50179305e63f5b22d1b0750e2a883
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Tue Mar 14 14:15:46 2006 +0000

    Changes for Visual Studio C++ 2005 (8.0), part 1
---
 src/actions.cpp    | 2 ++
 src/exv_msvc.h     | 9 +++++++++
 src/getopt_win32.c | 5 +++++
 src/localtime.c    | 9 +++++++++
 4 files changed, 25 insertions(+)

diff --git a/src/actions.cpp b/src/actions.cpp
index 1e49a97..4084949 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -1007,6 +1007,7 @@ namespace Action {
     }
 
     int Modify::run(const std::string& path)
+    {
     try {
         if (!Exiv2::fileExists(path, true)) {
             std::cerr << path
@@ -1065,6 +1066,7 @@ namespace Action {
         std::cerr << "Exiv2 exception in modify action for file " << path
                   << ":
" << e << "
";
         return 1;
+    }
     } // Modify::run
 
     void Modify::addMetadatum(const ModifyCmd& modifyCmd)
diff --git a/src/exv_msvc.h b/src/exv_msvc.h
index a84985c..ff07edd 100644
--- a/src/exv_msvc.h
+++ b/src/exv_msvc.h
@@ -38,4 +38,13 @@
 #define EXV_SEPERATOR_STR "\"
 #define EXV_SEPERATOR_CHR '\'
 
+/*
+  Visual Studio C++ 2005 (8.0)
+  Disable warnings about 'deprecated' standard functions
+  See, eg. http://www.informit.com/guides/content.asp?g=cplusplus&seqNum=259
+*/
+#if _MSC_VER >= 1400
+# pragma warning(disable : 4996)
+#endif
+
 #endif /* _MSC_VER */
diff --git a/src/getopt_win32.c b/src/getopt_win32.c
index 1868fd5..fca2992 100644
--- a/src/getopt_win32.c
+++ b/src/getopt_win32.c
@@ -36,6 +36,11 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if _MSC_VER >= 1400
+# pragma warning(disable : 4996)
+#endif
+
+// included header files
 #include <assert.h>
 #include <errno.h>
 #include <stdlib.h>
diff --git a/src/localtime.c b/src/localtime.c
index 2e81638..55d797d 100644
--- a/src/localtime.c
+++ b/src/localtime.c
@@ -3,6 +3,7 @@
   @brief   This file is from the tz distribution at ftp://elsie.nci.nih.gov/pub/
   @version $Rev$
 */
+
 #ifdef _MSC_VER
 # include "exv_msvc.h"
 #else
@@ -1056,6 +1057,7 @@ struct tm * const	tmp;
 #endif /* defined TM_ZONE */
 }
 
+#if _MSC_VER < 1400
 struct tm *
 localtime(timep)
 const time_t * timep;
@@ -1064,6 +1066,7 @@ const time_t * timep;
 	localsub(timep, 0L, &tm);
 	return &tm;
 }
+#endif /*_MSC_VER < 1400 */
 
 /*
 ** Re-entrant version of localtime.
@@ -1118,6 +1121,7 @@ struct tm * const	tmp;
 #endif /* defined TM_ZONE */
 }
 
+#if _MSC_VER < 1400
 struct tm *
 gmtime(timep)
 const time_t * timep;
@@ -1125,6 +1129,7 @@ const time_t * timep;
 	gmtsub(timep, 0L, &tm);
 	return &tm;
 }
+#endif /* _MSC_VER < 1400 */
 
 /*
 * Re-entrant version of gmtime.
@@ -1253,6 +1258,7 @@ register struct tm * const		tmp;
 #endif /* defined TM_GMTOFF */
 }
 
+#if _MSC_VER < 1400
 char *
 ctime(timep)
 const time_t * timep;
@@ -1265,6 +1271,7 @@ const time_t * timep;
 */
 	return asctime(localtime(timep));
 }
+#endif /* _MSC_VER < 1400 */
 
 /* ahu: deleted definition of ctime_r */
 
@@ -1578,6 +1585,7 @@ const long		offset;
 	return WRONG;
 }
 
+#if _MSC_VER < 1400
 time_t
 mktime(tmp)
 struct tm * tmp;
@@ -1585,6 +1593,7 @@ struct tm * tmp;
 	tzset();
 	return time1(tmp, localsub, 0L);
 }
+#endif /* _MSC_VER < 1400 */
 
 #ifdef STD_INSPIRED
 

-- 
exiv2 packaging