[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=5a5fcf8

The following commit has been merged in the master branch:
commit 5a5fcf85034165ed8fe3039b3c7a2654dc1ecf08
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Wed Jun 28 05:36:49 2006 +0000

    Added workaround for mmap/munmap for platforms which do not have these (MinGW and MSVC), converted CrwImage to use mmap too.
---
 config/config.h.in            |  9 +++++++++
 config/configure.ac           |  4 ++--
 msvc/exiv2lib/exiv2lib.vcproj | 18 ++++++++++++++++++
 src/basicio.cpp               | 29 ++++++++++++++++++++++-------
 src/basicio.hpp               | 15 ++++++++++-----
 src/crwimage.cpp              |  8 +-------
 6 files changed, 62 insertions(+), 21 deletions(-)

diff --git a/config/config.h.in b/config/config.h.in
index 22aef67..0398cfb 100644
--- a/config/config.h.in
+++ b/config/config.h.in
@@ -85,6 +85,12 @@
 /* Define to 1 if you have the `strtol' function. */
 #undef HAVE_STRTOL
 
+/* Define to 1 if you have the `mmap' function. */
+#undef HAVE_MMAP
+
+/* Define to 1 if you have the `munmap' function. */
+#undef HAVE_MUNMAP
+
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #undef HAVE_SYS_STAT_H
 
@@ -106,6 +112,9 @@
 /* Define to 1 if you have the <wchar.h> header file. */
 #undef HAVE_WCHAR_H
 
+/* Define to 1 if you have the <sys/mman.h> header file. */
+#undef HAVE_SYS_MMAN_H
+
 /* Define to 1 if you have the `zlib' library. */
 #undef HAVE_LIBZ
 
diff --git a/config/configure.ac b/config/configure.ac
index ad39a4f..b62b139 100644
--- a/config/configure.ac
+++ b/config/configure.ac
@@ -27,7 +27,7 @@ AC_SUBST(HAVE_LIBZ,$HAVE_LIBZ)
 
 # Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS([libintl.h malloc.h stdint.h stdlib.h string.h unistd.h wchar.h])
+AC_CHECK_HEADERS([libintl.h malloc.h stdint.h stdlib.h string.h unistd.h wchar.h sys/mman.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_HEADER_STDBOOL
@@ -47,7 +47,7 @@ AC_FUNC_STAT
 AC_FUNC_STRERROR_R
 AC_FUNC_STRFTIME
 AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([gmtime_r memset strchr strerror strtol])
+AC_CHECK_FUNCS([gmtime_r memset strchr strerror strtol mmap munmap])
 AC_CHECK_FUNCS([timegm], HAVE_TIMEGM=1)
 AC_SUBST(HAVE_TIMEGM,$HAVE_TIMEGM)
 
diff --git a/msvc/exiv2lib/exiv2lib.vcproj b/msvc/exiv2lib/exiv2lib.vcproj
index d1066af..82d7173 100644
--- a/msvc/exiv2lib/exiv2lib.vcproj
+++ b/msvc/exiv2lib/exiv2lib.vcproj
@@ -125,6 +125,21 @@
 				</FileConfiguration>
 			</File>
 			<File
+				RelativePath="..\..\src
-- 
exiv2 packaging