commit bfa99ef8971f5958133059b66d164d4ecec149c2
parent 305b8dd11b0cc88157006060e04a448c524eafeb
Author: Christian Grothoff <christian@grothoff.org>
Date: Mon, 11 Jul 2005 19:08:47 +0000
update
Diffstat:
2 files changed, 20 insertions(+), 170 deletions(-)
diff --git a/src/plugins/exiv2/exv_conf.h b/src/plugins/exiv2/exv_conf.h
@@ -1,150 +1,26 @@
-/* ./config/config.h. Generated by configure. */
-/* config.h.in. Generated from configure.ac by autoheader. */
-
-/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
- systems. This function is required for `alloca.c' support on those systems.
- */
-/* #undef EXV_CRAY_STACKSEG_END */
-
-/* Define to 1 if using `alloca.c'. */
-/* #undef EXV_C_ALLOCA */
+#include "config.h"
#define SUPPRESS_WARNINGS 1
-/* Define to 1 if you have the `alarm' function. */
-#define EXV_HAVE_ALARM 1
-
-/* Define to 1 if you have `alloca', as a function or macro. */
-#define EXV_HAVE_ALLOCA 1
-
-/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
- */
-#define EXV_HAVE_ALLOCA_H 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define EXV_HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the <libintl.h> header file. */
-#define EXV_HAVE_LIBINTL_H 1
-
-/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
- to 0 otherwise. */
-#define EXV_HAVE_MALLOC 1
-
-/* Define to 1 if you have the <malloc.h> header file. */
-#define EXV_HAVE_MALLOC_H 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define EXV_HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the `memset' function. */
-#define EXV_HAVE_MEMSET 1
-
-/* Define to 1 if `stat' has the bug that it succeeds when given the
- zero-length file name argument. */
-/* #undef EXV_HAVE_STAT_EMPTY_STRING_BUG */
-
-/* Define to 1 if stdbool.h conforms to C99. */
-#define EXV_HAVE_STDBOOL_H 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define EXV_HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define EXV_HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the `strchr' function. */
-#define EXV_HAVE_STRCHR 1
-
-/* Define to 1 if you have the `strerror' function. */
-#define EXV_HAVE_STRERROR 1
-
-/* Define to 1 if you have the `strftime' function. */
-#define EXV_HAVE_STRFTIME 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define EXV_HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define EXV_HAVE_STRING_H 1
-
-/* Define to 1 if you have the `strtol' function. */
-#define EXV_HAVE_STRTOL 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define EXV_HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#define EXV_HAVE_SYS_TIME_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define EXV_HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the `timegm' function. */
-#define EXV_HAVE_TIMEGM 1
-
/* Define to 1 if you have the <unistd.h> header file. */
-#define EXV_HAVE_UNISTD_H 1
-
-/* Define to 1 if you have the <wchar.h> header file. */
-#define EXV_HAVE_WCHAR_H 1
-
-/* Define to 1 if the system has the type `_Bool'. */
-#define EXV_HAVE__BOOL 1
+#define EXV_HAVE_UNISTD_H HAVE_UNISTD_H
-/* Define to 1 if `lstat' dereferences a symlink specified with a trailing
- slash. */
-#define EXV_LSTAT_FOLLOWS_SLASHED_SYMLINK 1
-
-/* Define to the address where bug reports for this package should be sent. */
-#define EXV_PACKAGE_BUGREPORT "ahuggel@gmx.net"
+/* Define to the address where bug reports for this package should be
+ sent. */
+#define EXV_PACKAGE_BUGREPORT PACKAGE_BUGREPORT
/* Define to the full name of this package. */
-#define EXV_PACKAGE_NAME "Exiv2"
+#define EXV_PACKAGE_NAME PACKAGE_NAME
/* Define to the full name and version of this package. */
-#define EXV_PACKAGE_STRING "Exiv2 0.7"
-
-/* Define to the one symbol short name of this package. */
-#define EXV_PACKAGE_TARNAME "exiv2"
+#define EXV_PACKAGE_STRING PACKAGE_STRING
/* Define to the version of this package. */
-#define EXV_PACKAGE_VERSION "0.7"
-
-/* If using the C implementation of alloca, define if you know the
- direction of stack growth for your system; otherwise it will be
- automatically deduced at run-time.
- STACK_DIRECTION > 0 => grows toward higher addresses
- STACK_DIRECTION < 0 => grows toward lower addresses
- STACK_DIRECTION = 0 => direction of growth unknown */
-/* #undef EXV_STACK_DIRECTION */
-
-/* Define to 1 if you have the ANSI C header files. */
-#define EXV_STDC_HEADERS 1
-
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#define EXV_TIME_WITH_SYS_TIME 1
+#define EXV_PACKAGE_VERSION PACKAGE_VERSION
-/* Define to 1 if your <sys/time.h> declares `struct tm'. */
-/* #undef EXV_TM_IN_SYS_TIME */
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
- calls it, or to nothing if 'inline' is not supported under any name. */
-#ifndef __cplusplus
-/* #undef inline */
-#endif
-
-/* Define to rpl_malloc if the replacement function should be used. */
-/* #undef malloc */
-
-/* Define to `int' if <sys/types.h> does not define. */
-/* #undef pid_t */
-
-/* Define to `unsigned' if <sys/types.h> does not define. */
-/* #undef size_t */
+/* File path seperator */
+#define EXV_SEPERATOR_STR DIR_SEPARATOR_STR
+#define EXV_SEPERATOR_CHR DIR_SEPARATOR
#if defined __CYGWIN32__ && !defined __CYGWIN__
/* For backwards compatibility with Cygwin b19 and
@@ -152,12 +28,3 @@
we can rely on checking just for that macro. */
#define __CYGWIN__ __CYGWIN32__
#endif
-
-/* File path seperator */
-#if defined WIN32 && !defined __CYGWIN__
-#define EXV_SEPERATOR_STR "\\"
-#define EXV_SEPERATOR_CHR '\\'
-#else
-#define EXV_SEPERATOR_STR "/"
-#define EXV_SEPERATOR_CHR '/'
-#endif
diff --git a/src/plugins/exiv2/exv_msvc.h b/src/plugins/exiv2/exv_msvc.h
@@ -1,41 +1,24 @@
-/* ***************************************************************** -*- C -*- */
-/*!
- @file exv_msvc.h
- @brief Configuration settings for MSVC
- @version $Rev$
- @author Andreas Huggel (ahu)
- <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
- @date 07-Feb-04, ahu: created
- 26-Feb-05, ahu: renamed and moved to src directory
- */
-
-/* Todo: The PACKAGE_* defines should be generated */
+#include "config.h"
+#include "plibc.h"
#ifdef _MSC_VER
-/* Define to 1 if you have the <process.h> header file. */
-#define EXV_HAVE_PROCESS_H 1
+#define SUPPRESS_WARNINGS 1
/* Define to the address where bug reports for this package should be sent. */
-#define EXV_PACKAGE_BUGREPORT "ahuggel@gmx.net"
+#define EXV_PACKAGE_BUGREPORT PACKAGE_BUGREPORT
/* Define to the full name of this package. */
-#define EXV_PACKAGE_NAME "Exiv2"
+#define EXV_PACKAGE_NAME PACKAGE_NAME
/* Define to the full name and version of this package. */
-#define EXV_PACKAGE_STRING "Exiv2 0.7"
-
-/* Define to the one symbol short name of this package. */
-#define EXV_PACKAGE_TARNAME "exiv2"
+#define EXV_PACKAGE_STRING PACKAGE_STRING
/* Define to the version of this package. */
-#define EXV_PACKAGE_VERSION "0.7"
-
-/* Define to `int' if <sys/types.h> does not define pid_t. */
-#define pid_t int
+#define EXV_PACKAGE_VERSION PACKAGE_VERSION
/* File path seperator */
-#define EXV_SEPERATOR_STR "\\"
-#define EXV_SEPERATOR_CHR '\\'
+#define EXV_SEPERATOR_STR DIR_SEPARATOR_STR
+#define EXV_SEPERATOR_CHR DIR_SEPARATOR
#endif /* _MSC_VER */
