diff options
| -rw-r--r-- | .hgignore | 1 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | config.h.in | 21 | ||||
| -rw-r--r-- | configure.in | 41 | ||||
| -rw-r--r-- | d_size.h | 24 |
5 files changed, 50 insertions, 39 deletions
@@ -16,7 +16,6 @@ ^missing$ (^|/)tags$ ^src/dillo$ -^d_size\.h$ ^dpi/[^/]*\.dpi$ ^dpid/dpid$ ^dpid/dpidc$ diff --git a/Makefile.am b/Makefile.am index 52acc2af..3cc1a098 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ SUBDIRS = lout dw dlib dpip src doc dpid dpi test -EXTRA_DIST = Doxyfile dillorc install-dpi-local +EXTRA_DIST = Doxyfile dillorc install-dpi-local d_size.h sysconf_DATA = dillorc diff --git a/config.h.in b/config.h.in index 54501855..371d658f 100644 --- a/config.h.in +++ b/config.h.in @@ -105,8 +105,29 @@ /* Version number of package */ #undef VERSION +/* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>, + <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the + #define below would cause a syntax error. */ +#undef _UINT32_T + /* Use char pointers for newer libiconv */ #undef inbuf_t +/* Define to the type of a signed integer type of width exactly 16 bits if + such a type exists and the standard includes do not define it. */ +#undef int16_t + +/* Define to the type of a signed integer type of width exactly 32 bits if + such a type exists and the standard includes do not define it. */ +#undef int32_t + /* Define the real type of socklen_t */ #undef socklen_t + +/* Define to the type of an unsigned integer type of width exactly 16 bits if + such a type exists and the standard includes do not define it. */ +#undef uint16_t + +/* Define to the type of an unsigned integer type of width exactly 32 bits if + such a type exists and the standard includes do not define it. */ +#undef uint32_t diff --git a/configure.in b/configure.in index a905051f..6ddf8642 100644 --- a/configure.in +++ b/configure.in @@ -53,43 +53,10 @@ AC_CHECK_SIZEOF(long) AC_CHECK_SIZEOF(int) AC_CHECK_SIZEOF(void *) -case 2 in -$ac_cv_sizeof_short) gint16=short;; -$ac_cv_sizeof_int) gint16=int;; -esac -case 4 in -$ac_cv_sizeof_short) gint32=short;; -$ac_cv_sizeof_int) gint32=int;; -$ac_cv_sizeof_long) gint32=long;; -esac - -cat >d_size.h <<_______EOF -#ifndef __D_SIZE_H__ -#define __D_SIZE_H__ - - -#include "config.h" - -#if HAVE_STDINT_H == 0 -#include <stdint.h> -#elif defined(HAVE_INTTYPES_H) -#include <inttypes.h> -#else -typedef signed $gint16 int16_t; -typedef unsigned $gint16 uint16_t; -typedef signed $gint32 int32_t; -typedef unsigned $gint32 uint32_t; -#endif -typedef unsigned char uchar_t; -typedef unsigned short ushort_t; -typedef unsigned long ulong_t; -typedef unsigned int uint_t; -typedef unsigned char bool_t; - - -#endif /* __D_SIZE_H__ */ -_______EOF - +AC_TYPE_INT16_T +AC_TYPE_UINT16_T +AC_TYPE_INT32_T +AC_TYPE_UINT32_T dnl -------------------------------------- dnl Check whether to add /usr/local or not diff --git a/d_size.h b/d_size.h new file mode 100644 index 00000000..2e2019e7 --- /dev/null +++ b/d_size.h @@ -0,0 +1,24 @@ +#ifndef __D_SIZE_H__ +#define __D_SIZE_H__ + + +#include "config.h" + +#ifdef HAVE_STDINT_H +#include <stdint.h> +#else +#ifdef HAVE_INTTYPES_H +#include <inttypes.h> +#else +/* config.h defines {int,uint}*_t */ +#endif /* HAVE_INTTYPES_H */ +#endif /*HAVE_STDINT_H */ + +typedef unsigned char uchar_t; +typedef unsigned short ushort_t; +typedef unsigned long ulong_t; +typedef unsigned int uint_t; +typedef unsigned char bool_t; + + +#endif /* __D_SIZE_H__ */ |