diff --git a/ChangeLog b/ChangeLog index 15b3a939..2107a484 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-08-01 Andrey Kiselev + + * libtiff/{tif_config.h.in, tif_config.h.vc}: config.h.in and + config.h.vc files renamed in the tif_config.h.in and tif_config.h.vc. + 2004-07-24 Andrey Kiselev * libtiff/tif_lzw.c: LZW compression code is merged back from the diff --git a/configure b/configure index 0052f3f2..e6b75cc7 100755 --- a/configure +++ b/configure @@ -464,7 +464,7 @@ ac_includes_default="\ # include #endif" -ac_unique_file="libtiff/config.h.in" +ac_unique_file="libtiff/tif_config.h.in" ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTIFF_MAJOR_VERSION LIBTIFF_MINOR_VERSION LIBTIFF_MICRO_VERSION LIBTIFF_ALPHA_VERSION LIBTIFF_VERSION LIBTIFF_RELEASE_DATE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS HAVE_OPENGL_TRUE HAVE_OPENGL_FALSE OPENGL_LIBS LTLIBOBJS' ac_subst_files='' @@ -20112,6 +20112,109 @@ fi + ansi=ANSI + if test -z "$ansi"; then + msg="for C compiler warning flags" + else + msg="for C compiler warning and ANSI conformance flags" + fi + echo "$as_me:$LINENO: checking $msg" >&5 +echo $ECHO_N "checking $msg... $ECHO_C" >&6 +if test "${vl_cv_prog_cc_warnings+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + if test -n "$CC"; then + cat > conftest.c <&1 | grep -i "WorkShop" > /dev/null 2>&1 && + $CC -c -v -Xc conftest.c > /dev/null 2>&1 && + test -f conftest.o; then + if test -z "$ansi"; then + vl_cv_prog_cc_warnings="-v" + else + vl_cv_prog_cc_warnings="-v -Xc" + fi + + elif $CC -V 2>&1 | grep -i "Digital UNIX Compiler" > /dev/null 2>&1 && + $CC -c -verbose -w0 -warnprotos -std1 conftest.c > /dev/null 2>&1 && + test -f conftest.o; then + if test -z "$ansi"; then + vl_cv_prog_cc_warnings="-verbose -w0 -warnprotos" + else + vl_cv_prog_cc_warnings="-verbose -w0 -warnprotos -std1" + fi + + elif $CC 2>&1 | grep -i "C for AIX Compiler" > /dev/null 2>&1 && + $CC -c -qlanglvl=ansi -qinfo=all conftest.c > /dev/null 2>&1 && + test -f conftest.o; then + if test -z "$ansi"; then + vl_cv_prog_cc_warnings="-qsrcmsg -qinfo=all:noppt:noppc:noobs:nocnd" + else + vl_cv_prog_cc_warnings="-qsrcmsg -qinfo=all:noppt:noppc:noobs:nocnd -qlanglvl=ansi" + fi + + elif $CC -version 2>&1 | grep -i "MIPSpro Compilers" > /dev/null 2>&1 && + $CC -c -fullwarn -ansi -ansiE conftest.c > /dev/null 2>&1 && + test -f conftest.o; then + if test -z "$ansi"; then + vl_cv_prog_cc_warnings="-fullwarn" + else + vl_cv_prog_cc_warnings="-fullwarn -ansi -ansiE" + fi + + elif what $CC 2>&1 | grep -i "HP C Compiler" > /dev/null 2>&1 && + $CC -c -Aa +w1 conftest.c > /dev/null 2>&1 && + test -f conftest.o; then + if test -z "$ansi"; then + vl_cv_prog_cc_warnings="+w1" + else + vl_cv_prog_cc_warnings="+w1 -Aa" + fi + + elif $CC -V 2>&1 | grep "/SX" > /dev/null 2>&1 && + $CC -c -pvctl,fullmsg -Xc conftest.c > /dev/null 2>&1 && + test -f conftest.o; then + if test -z "$ansi"; then + vl_cv_prog_cc_warnings="-pvctl,fullmsg" + else + vl_cv_prog_cc_warnings="-pvctl,fullmsg -Xc" + fi + + elif $CC -V 2>&1 | grep -i "Cray" > /dev/null 2>&1 && + $CC -c -h msglevel 2 conftest.c > /dev/null 2>&1 && + test -f conftest.o; then + if test -z "$ansi"; then + vl_cv_prog_cc_warnings="-h msglevel 2" + else + vl_cv_prog_cc_warnings="-h msglevel 2 -h conform" + fi + + fi + rm -f conftest.* + fi + if test -n "$vl_cv_prog_cc_warnings"; then + CFLAGS="$CFLAGS $vl_cv_prog_cc_warnings" + else + vl_cv_prog_cc_warnings="unknown" + fi + +fi +echo "$as_me:$LINENO: result: $vl_cv_prog_cc_warnings" >&5 +echo "${ECHO_T}$vl_cv_prog_cc_warnings" >&6 + + + echo "$as_me:$LINENO: checking for main in -lc" >&5 echo $ECHO_N "checking for main in -lc... $ECHO_C" >&6 if test "${ac_cv_lib_c_main+set}" = set; then @@ -24410,10 +24513,10 @@ fi - ac_config_headers="$ac_config_headers libtiff/config.h" + ac_config_headers="$ac_config_headers libtiff/tif_config.h" - ac_config_files="$ac_config_files Makefile contrib/Makefile contrib/acorn/Makefile contrib/addtiffo/Makefile contrib/dbs/Makefile contrib/dbs/xtiff/Makefile contrib/iptcutil/Makefile contrib/mac-cw/Makefile contrib/mac-mpw/Makefile contrib/mfs/Makefile contrib/ojpeg/Makefile contrib/pds/Makefile contrib/ras/Makefile contrib/stream/Makefile contrib/tags/Makefile contrib/win_dib/Makefile html/Makefile html/images/Makefile html/man/Makefile libtiff/Makefile man/Makefile port/Makefile tools/Makefile" + ac_config_files="$ac_config_files Makefile contrib/Makefile contrib/acorn/Makefile contrib/addtiffo/Makefile contrib/dbs/Makefile contrib/dbs/xtiff/Makefile contrib/iptcutil/Makefile contrib/mac-cw/Makefile contrib/mac-mpw/Makefile contrib/mfs/Makefile contrib/ojpeg/Makefile contrib/pds/Makefile contrib/ras/Makefile contrib/stream/Makefile contrib/tags/Makefile contrib/win_dib/Makefile html/Makefile html/images/Makefile html/man/Makefile libtiff/Makefile man/Makefile port/Makefile test/Makefile tools/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -25014,9 +25117,10 @@ do "libtiff/Makefile" ) CONFIG_FILES="$CONFIG_FILES libtiff/Makefile" ;; "man/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; "port/Makefile" ) CONFIG_FILES="$CONFIG_FILES port/Makefile" ;; + "test/Makefile" ) CONFIG_FILES="$CONFIG_FILES test/Makefile" ;; "tools/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;; "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; - "libtiff/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS libtiff/config.h" ;; + "libtiff/tif_config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS libtiff/tif_config.h" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; diff --git a/configure.ac b/configure.ac index 48285f00..cf8c225e 100644 --- a/configure.ac +++ b/configure.ac @@ -59,6 +59,9 @@ AC_PROG_INSTALL AC_PROG_LN_S AC_PROG_RANLIB +dnl We want warnings. As many warnings as possible. +VL_PROG_CC_WARNINGS(ANSI) + dnl Checks for libraries. AC_CHECK_LIB([c], [main]) @@ -391,8 +394,8 @@ fi dnl --------------------------------------------------------------------------- -AC_CONFIG_SRCDIR(libtiff/config.h.in) -AM_CONFIG_HEADER(libtiff/config.h) +AC_CONFIG_SRCDIR(libtiff/tif_config.h.in) +AM_CONFIG_HEADER(libtiff/tif_config.h) AC_CONFIG_FILES([Makefile \ contrib/Makefile \ @@ -416,6 +419,7 @@ AC_CONFIG_FILES([Makefile \ libtiff/Makefile \ man/Makefile \ port/Makefile \ + test/Makefile \ tools/Makefile]) AC_OUTPUT diff --git a/libtiff/Makefile.am b/libtiff/Makefile.am index 804db25e..52f9b337 100644 --- a/libtiff/Makefile.am +++ b/libtiff/Makefile.am @@ -29,7 +29,7 @@ LIBPORT = -L$(top_builddir)/port -lport # shared with other makefiles include files.lst -EXTRA_DIST = Makefile.vc config.h.vc files.lst $(EXTRA_SRCS) +EXTRA_DIST = Makefile.vc tif_config.h.vc files.lst $(EXTRA_SRCS) libtiffincludedir = $(includedir) libtiffinclude_HEADERS = $(HDRS) diff --git a/libtiff/Makefile.in b/libtiff/Makefile.in index e6883df7..d3a3fab9 100644 --- a/libtiff/Makefile.in +++ b/libtiff/Makefile.in @@ -66,7 +66,7 @@ POST_UNINSTALL = : host_triplet = @host@ DIST_COMMON = $(libtiffinclude_HEADERS) $(noinst_HEADERS) \ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/config.h.in $(srcdir)/files.lst + $(srcdir)/files.lst $(srcdir)/tif_config.h.in noinst_PROGRAMS = mkg3states$(EXEEXT) subdir = libtiff ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -75,7 +75,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = config.h +CONFIG_HEADER = tif_config.h CONFIG_CLEAN_FILES = am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libtiffincludedir)" libLTLIBRARIES_INSTALL = $(INSTALL) @@ -317,7 +317,7 @@ EXTRA_SRCS = \ # Read list of source files and headers from the external file, # shared with other makefiles -EXTRA_DIST = Makefile.vc config.h.vc files.lst $(EXTRA_SRCS) +EXTRA_DIST = Makefile.vc tif_config.h.vc files.lst $(EXTRA_SRCS) libtiffincludedir = $(includedir) libtiffinclude_HEADERS = $(HDRS) noinst_HEADERS = $(EXTRA_HDRS) @@ -329,7 +329,7 @@ libtiff_la_LDFLAGS = \ mkg3states_SOURCES = mkg3states.c tif_fax3.h mkg3states_LDADD = $(LIBPORT) -all: config.h +all: tif_config.h $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: @@ -364,22 +364,22 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -config.h: stamp-h1 +tif_config.h: stamp-h1 @if test ! -f $@; then \ rm -f stamp-h1; \ $(MAKE) stamp-h1; \ else :; fi -stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status +stamp-h1: $(srcdir)/tif_config.h.in $(top_builddir)/config.status @rm -f stamp-h1 - cd $(top_builddir) && $(SHELL) ./config.status libtiff/config.h -$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(SHELL) ./config.status libtiff/tif_config.h +$(srcdir)/tif_config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_srcdir) && $(AUTOHEADER) rm -f stamp-h1 touch $@ distclean-hdr: - -rm -f config.h stamp-h1 + -rm -f tif_config.h stamp-h1 install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" @@ -525,11 +525,11 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) mkid -fID $$unique tags: TAGS -TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ +TAGS: $(HEADERS) $(SOURCES) tif_config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) tif_config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -541,11 +541,11 @@ TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $$tags $$unique; \ fi ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ +CTAGS: $(HEADERS) $(SOURCES) tif_config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) tif_config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -592,7 +592,7 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) config.h +all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) tif_config.h installdirs: for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libtiffincludedir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ diff --git a/libtiff/Makefile.vc b/libtiff/Makefile.vc index e2c9176f..cf7c29a3 100644 --- a/libtiff/Makefile.vc +++ b/libtiff/Makefile.vc @@ -1,4 +1,4 @@ -# $Id: Makefile.vc,v 1.7 2004-07-03 16:03:04 dron Exp $ +# $Id: Makefile.vc,v 1.8 2004-08-01 10:37:42 dron Exp $ # # Copyright (C) 2004, Andrey Kiselev # @@ -71,13 +71,13 @@ OBJ = \ all: libtiff.lib libtiff.dll -config.h: - copy config.h.vc config.h +tif_config.h: + copy tif_config.h.vc tif_config.h -libtiff.lib: config.h $(OBJ) +libtiff.lib: tif_config.h $(OBJ) $(AR) /out:libtiff.lib $(OBJ) $(LIBS) -libtiff.dll: config.h $(OBJ) +libtiff.dll: tif_config.h $(OBJ) $(LD) /dll /def:libtiff.def /out:libtiff.dll \ /implib:libtiff_i.lib $(OBJ) $(LIBS) diff --git a/libtiff/mkg3states.c b/libtiff/mkg3states.c index cceb254c..0d4bf3de 100644 --- a/libtiff/mkg3states.c +++ b/libtiff/mkg3states.c @@ -1,4 +1,4 @@ -/* "$Id: mkg3states.c,v 1.4 2004-07-03 16:05:40 dron Exp $ */ +/* "$Id: mkg3states.c,v 1.5 2004-08-01 10:37:42 dron Exp $ */ /* * Copyright (c) 1991-1997 Sam Leffler @@ -29,7 +29,7 @@ * in Frank Cringle's viewfax program; * Copyright (C) 1990, 1995 Frank D. Cringle. */ -#include "config.h" +#include "tif_config.h" #include #include diff --git a/libtiff/tif_config.h.in b/libtiff/tif_config.h.in new file mode 100644 index 00000000..ec067b2e --- /dev/null +++ b/libtiff/tif_config.h.in @@ -0,0 +1,186 @@ +/* libtiff/tif_config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if you have the header file. */ +#undef HAVE_DLFCN_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_FCNTL_H + +/* Define to 1 if you have the `floor' function. */ +#undef HAVE_FLOOR + +/* Define to 1 if you have the `getopt' function. */ +#undef HAVE_GETOPT + +/* Define to 1 if you have the header file. */ +#undef HAVE_GETOPT_H + +/* Define as 0 or 1 according to the floating point format suported by the + machine */ +#undef HAVE_IEEEFP + +/* Define to 1 if the system has the type `int16'. */ +#undef HAVE_INT16 + +/* Define to 1 if the system has the type `int32'. */ +#undef HAVE_INT32 + +/* Define to 1 if the system has the type `int8'. */ +#undef HAVE_INT8 + +/* Define to 1 if you have the header file. */ +#undef HAVE_INTTYPES_H + +/* Define to 1 if you have the `isascii' function. */ +#undef HAVE_ISASCII + +/* Define to 1 if you have the `c' library (-lc). */ +#undef HAVE_LIBC + +/* Define to 1 if you have the `m' library (-lm). */ +#undef HAVE_LIBM + +/* Define to 1 if you have the header file. */ +#undef HAVE_LIMITS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_MALLOC_H + +/* Define to 1 if you have the `memmove' function. */ +#undef HAVE_MEMMOVE + +/* Define to 1 if you have the header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the `memset' function. */ +#undef HAVE_MEMSET + +/* Define to 1 if you have the `mmap' function. */ +#undef HAVE_MMAP + +/* Define to 1 if you have the `pow' function. */ +#undef HAVE_POW + +/* Define to 1 if you have the `sqrt' function. */ +#undef HAVE_SQRT + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the `strcasecmp' function. */ +#undef HAVE_STRCASECMP + +/* Define to 1 if you have the `strchr' function. */ +#undef HAVE_STRCHR + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the `strrchr' function. */ +#undef HAVE_STRRCHR + +/* Define to 1 if you have the `strstr' function. */ +#undef HAVE_STRSTR + +/* Define to 1 if you have the `strtol' function. */ +#undef HAVE_STRTOL + +/* Define to 1 if you have the `strtoul' function. */ +#undef HAVE_STRTOUL + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TIME_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_UNISTD_H + +/* Define to 1 if the system has the type `u_char'. */ +#undef HAVE_U_CHAR + +/* Define to 1 if the system has the type `u_int'. */ +#undef HAVE_U_INT + +/* Define to 1 if the system has the type `u_long'. */ +#undef HAVE_U_LONG + +/* Define to 1 if the system has the type `u_short'. */ +#undef HAVE_U_SHORT + +/* Define to 1 if you have the header file. */ +#undef HAVE_WINSOCK_H + +/* Set the native cpu bit order */ +#undef HOST_FILLORDER + +/* Name of package */ +#undef PACKAGE + +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + +/* The size of a `int', as computed by sizeof. */ +#undef SIZEOF_INT + +/* The size of a `long', as computed by sizeof. */ +#undef SIZEOF_LONG + +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + +/* Define to 1 if you can safely include both and . */ +#undef TIME_WITH_SYS_TIME + +/* Define to 1 if your declares `struct tm'. */ +#undef TM_IN_SYS_TIME + +/* Version number of package */ +#undef VERSION + +/* Define to 1 if your processor stores words with the most significant byte + first (like Motorola and SPARC, unlike Intel and VAX). */ +#undef WORDS_BIGENDIAN + +/* Number of bits in a file offset, on hosts where this is settable. */ +#undef _FILE_OFFSET_BITS + +/* Define for large files, on AIX-style hosts. */ +#undef _LARGE_FILES + +/* 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 `long' if does not define. */ +#undef off_t + +/* Define to `unsigned' if does not define. */ +#undef size_t diff --git a/libtiff/tif_config.h.vc b/libtiff/tif_config.h.vc new file mode 100644 index 00000000..f89abace --- /dev/null +++ b/libtiff/tif_config.h.vc @@ -0,0 +1,38 @@ +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define as 0 or 1 according to the floating point format suported by the + machine */ +#define HAVE_IEEEFP 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_IO_H 1 + +/* The size of a `int', as computed by sizeof. */ +#define SIZEOF_INT 4 + +/* The size of a `long', as computed by sizeof. */ +#define SIZEOF_LONG 4 + +/* Redefine functions from the as normal ones */ +#define lseek _lseek +#define open _open +#define close _close +#define read _read + +/* Set the native cpu bit order */ +#define HOST_FILLORDER FILLORDER_LSB2MSB + +/* Define to 1 if your processor stores words with the most significant byte + first (like Motorola and SPARC, unlike Intel and VAX). */ +/* #undef WORDS_BIGENDIAN */ + +/* 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 +#define inline __inline +#endif + diff --git a/libtiff/tiffiop.h b/libtiff/tiffiop.h index e31cffe2..0d048038 100644 --- a/libtiff/tiffiop.h +++ b/libtiff/tiffiop.h @@ -1,4 +1,4 @@ -/* $Id: tiffiop.h,v 1.21 2004-06-07 19:35:34 dron Exp $ */ +/* $Id: tiffiop.h,v 1.22 2004-08-01 10:41:56 dron Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -30,7 +30,7 @@ * ``Library-private'' definitions. */ -#include "config.h" +#include "tif_config.h" #if HAVE_FCNTL_H # include diff --git a/tools/bmp2tiff.c b/tools/bmp2tiff.c index 025a2e0a..e0243531 100644 --- a/tools/bmp2tiff.c +++ b/tools/bmp2tiff.c @@ -1,4 +1,4 @@ -/* $Id: bmp2tiff.c,v 1.4 2004-07-24 19:03:16 dron Exp $ +/* $Id: bmp2tiff.c,v 1.5 2004-08-01 10:39:41 dron Exp $ * * Project: libtiff tools * Purpose: Convert Windows BMP files in TIFF. @@ -27,7 +27,7 @@ * OF THIS SOFTWARE. */ -#include "config.h" +#include "tif_config.h" #include #include diff --git a/tools/fax2ps.c b/tools/fax2ps.c index 7d9951ae..6640c66e 100644 --- a/tools/fax2ps.c +++ b/tools/fax2ps.c @@ -1,4 +1,4 @@ -/* $Id: fax2ps.c,v 1.13 2004-07-03 16:04:01 dron Exp $" */ +/* $Id: fax2ps.c,v 1.14 2004-08-01 10:39:41 dron Exp $" */ /* * Copyright (c) 1991-1997 Sam Leffler @@ -23,7 +23,7 @@ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE * OF THIS SOFTWARE. */ -#include "config.h" +#include "tif_config.h" #include #include diff --git a/tools/tiffdump.c b/tools/tiffdump.c index 1ee1b0f2..0d51e8b8 100644 --- a/tools/tiffdump.c +++ b/tools/tiffdump.c @@ -1,4 +1,4 @@ -/* $Id: tiffdump.c,v 1.5 2004-06-04 11:50:09 dron Exp $ */ +/* $Id: tiffdump.c,v 1.6 2004-08-01 10:39:41 dron Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -24,7 +24,7 @@ * OF THIS SOFTWARE. */ -#include "config.h" +#include "tif_config.h" #include #include