diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2006-12-31 08:08:29 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2006-12-31 08:08:29 +0000 |
| commit | 31fc573df625b06a5f7b8b8e769e9f35cbfdaf91 (patch) | |
| tree | caf153af4ea24150e1f54e77c35b9ee51e727055 /lib/util | |
| parent | 2cc04cae07f40a7c58616e4614e88cf0ae8e63c7 (diff) | |
| download | netpbm-mirror-31fc573df625b06a5f7b8b8e769e9f35cbfdaf91.tar.gz netpbm-mirror-31fc573df625b06a5f7b8b8e769e9f35cbfdaf91.tar.xz netpbm-mirror-31fc573df625b06a5f7b8b8e769e9f35cbfdaf91.zip | |
Release 10.37.0
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@187 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'lib/util')
| -rw-r--r-- | lib/util/Makefile | 2 | ||||
| -rw-r--r-- | lib/util/wordaccess.h | 3 | ||||
| -rw-r--r-- | lib/util/wordaccess_64_le.h | 2 | ||||
| -rw-r--r-- | lib/util/wordaccess_gcc3_le.h | 2 |
4 files changed, 8 insertions, 1 deletions
diff --git a/lib/util/Makefile b/lib/util/Makefile index ffa1db5b..d770555f 100644 --- a/lib/util/Makefile +++ b/lib/util/Makefile @@ -20,7 +20,7 @@ include $(SRCDIR)/Makefile.common INCLUDES = -I $(BUILDDIR) -I $(SRCDIR)/$(SUBDIR)/.. $(UTILOBJECTS):%.o:%.c importinc - $(CC) -c $(INCLUDES) -DNDEBUG $(CFLAGS) $(CFLAGS_SHLIB) \ + $(CC) -c $(INCLUDES) -DNDEBUG $(CPPFLAGS) $(CFLAGS) $(CFLAGS_SHLIB) \ $(CFLAGS_PERSONAL) $(CADD) -o $@ $< testnstring: test.c nstring.h nstring.o diff --git a/lib/util/wordaccess.h b/lib/util/wordaccess.h index 28963aee..08034361 100644 --- a/lib/util/wordaccess.h +++ b/lib/util/wordaccess.h @@ -37,6 +37,9 @@ We also assume that a char is 8 bits. */ + +#include "pm_config.h" + #if (!defined(WORDACCESS_GENERIC) \ && defined(__GNUC__) && defined(__GLIBC__) \ && (__GNUC__ * 100 + __GNUC_MINOR__ >= 304) ) diff --git a/lib/util/wordaccess_64_le.h b/lib/util/wordaccess_64_le.h index 2343b6d4..83bbf2bf 100644 --- a/lib/util/wordaccess_64_le.h +++ b/lib/util/wordaccess_64_le.h @@ -15,6 +15,8 @@ */ #include <byteswap.h> /* See note above on bswap_64 */ + +#include "pm.h" typedef uint64_t wordint; typedef unsigned char wordintBytes[sizeof(wordint)]; diff --git a/lib/util/wordaccess_gcc3_le.h b/lib/util/wordaccess_gcc3_le.h index 7db218db..798566af 100644 --- a/lib/util/wordaccess_gcc3_le.h +++ b/lib/util/wordaccess_gcc3_le.h @@ -15,6 +15,8 @@ typedef unsigned char wordintBytes[sizeof(wordint)]; #include <sys/types.h> #include <netinet/in.h> +#include "pm.h" + /* Here we use the more widely used functions htonl and ntohl instead of bswap_32. This makes possible the handling of weird byte ordering |