[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:45:34 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=5336688
The following commit has been merged in the master branch:
commit 533668808d5cb6a741ce67689ef2b4b62cd210dd
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Sun Jun 21 14:21:21 2015 +0000
Fixed cross-compiler warnings.
---
config/config.h.in | 2 +-
include/exiv2/config.h | 2 +-
src/basicio.cpp | 10 +++++-----
src/http.cpp | 1 -
4 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/config/config.h.in b/config/config.h.in
index c5a7a67..b5706bd 100644
--- a/config/config.h.in
+++ b/config/config.h.in
@@ -290,4 +290,4 @@
#endif
#endif
-#endif
\ No newline at end of file
+#endif
diff --git a/include/exiv2/config.h b/include/exiv2/config.h
index 378f840..d03a8cd 100644
--- a/include/exiv2/config.h
+++ b/include/exiv2/config.h
@@ -48,4 +48,4 @@
#endif
// That's all Folks!
-////
\ No newline at end of file
+//
diff --git a/src/basicio.cpp b/src/basicio.cpp
index 2db9868..143671b 100644
--- a/src/basicio.cpp
+++ b/src/basicio.cpp
@@ -154,15 +154,15 @@ namespace Exiv2 {
}; // class FileIo::Impl
FileIo::Impl::Impl(const std::string& path)
- : path_(path)
- , fp_(0), opMode_(opSeek)
- , pMappedArea_(0), mappedLength_(0), isMalloced_(false), isWriteable_(false)
+ : path_(path),
#ifdef EXV_UNICODE_PATH
- , wpMode_(wpStandard)
+ wpMode_(wpStandard),
#endif
+ fp_(0), opMode_(opSeek),
#if defined WIN32 && !defined __CYGWIN__
- , hFile_(0), hMap_(0)
+ hFile_(0), hMap_(0),
#endif
+ pMappedArea_(0), mappedLength_(0), isMalloced_(false), isWriteable_(false)
{
}
diff --git a/src/http.cpp b/src/http.cpp
index c49bbe0..b8a429b 100644
--- a/src/http.cpp
+++ b/src/http.cpp
@@ -44,7 +44,6 @@
#define SNOOZE 0
#if defined(__MINGW32__) || defined(__MINGW64__)
-#define __MINGW__
#define fopen_S(f,n,a) f=fopen(n,a)
#endif
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list