From: Hans U. N. <hu...@us...> - 2004-04-06 19:44:49
|
Update of /cvsroot/libexif/libexif/libexif In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25571/libexif Modified Files: Makefile.am exif-utils.h Log Message: Create and use _stdint.h Index: exif-utils.h =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/exif-utils.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- exif-utils.h 1 Apr 2004 20:37:39 -0000 1.8 +++ exif-utils.h 6 Apr 2004 19:31:54 -0000 1.9 @@ -25,13 +25,13 @@ extern "C" { #endif /* __cplusplus */ -#include <libexif/exif-byte-order.h> +#include "libexif/exif-byte-order.h" +#include "libexif/_stdint.h" -/* Works correct only on machines with a stdint.h, otherwise it assumes - * sizeof(long) == 4 */ - -#ifdef HAVE_INTTYPES_H -#include <inttypes.h> + +/* If these definitions don't work for you, please let us fix the + * macro generating _stdint.h */ + typedef char ExifByte; /* 1 byte */ typedef char * ExifAscii; typedef uint16_t ExifShort; /* 2 bytes */ @@ -41,16 +41,6 @@ typedef int32_t ExifSLong; /* 4 bytes */ typedef struct {ExifSLong numerator; ExifSLong denominator;} ExifSRational; -#else -typedef char ExifByte; /* 1 byte */ -typedef char * ExifAscii; -typedef unsigned short ExifShort; /* 2 bytes */ -typedef unsigned long ExifLong; /* 4 bytes */ -typedef struct {ExifLong numerator; ExifLong denominator;} ExifRational; -typedef char ExifUndefined; /* 1 byte */ -typedef signed long ExifSLong; /* 4 bytes */ -typedef struct {ExifSLong numerator; ExifSLong denominator;} ExifSRational; -#endif ExifShort exif_get_short (const unsigned char *b, ExifByteOrder order); ExifLong exif_get_long (const unsigned char *b, ExifByteOrder order); Index: Makefile.am =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/Makefile.am,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- Makefile.am 26 Oct 2003 22:30:26 -0000 1.23 +++ Makefile.am 6 Apr 2004 19:31:54 -0000 1.24 @@ -45,3 +45,5 @@ pkgconfig_DATA = libexif.pc EXTRA_DIST = libexif.pc.in +clean-generic: + rm -f _stdint.h |