diff options
| author | Simon Josefsson <simon@josefsson.org> | 2006-06-26 11:58:01 +0000 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2006-06-26 11:58:01 +0000 |
| commit | 03a32784a5b6c262503f29d8b44a94735dcf7f10 (patch) | |
| tree | 1bd43e0c581083b9acf78d57110875f50845907e /gl | |
| parent | 1e2b09923c358babf7b14c471741a8edc5b930b5 (diff) | |
| download | gnutls-03a32784a5b6c262503f29d8b44a94735dcf7f10.tar.gz | |
Update.
Diffstat (limited to 'gl')
| -rw-r--r-- | gl/Makefile.am | 8 | ||||
| -rw-r--r-- | gl/m4/stdint.m4 | 4 | ||||
| -rw-r--r-- | gl/stdint_.h | 35 |
3 files changed, 40 insertions, 7 deletions
diff --git a/gl/Makefile.am b/gl/Makefile.am index 6f492ef70f..9f9d9567c5 100644 --- a/gl/Makefile.am +++ b/gl/Makefile.am @@ -280,7 +280,13 @@ libgnu_la_SOURCES += dummy.c ## end gnulib module dummy + mostlyclean-local: - -test -n "$(MOSTLYCLEANDIRS)" && rmdir $(MOSTLYCLEANDIRS) 2>/dev/null + @test -z "$(MOSTLYCLEANDIRS)" || \ + for dir in $(MOSTLYCLEANDIRS); do \ + if test -d $$dir; then \ + echo "rmdir $$dir"; rmdir $$dir; \ + fi; \ + done # Makefile.am ends here diff --git a/gl/m4/stdint.m4 b/gl/m4/stdint.m4 index 55388fae95..733c3c6021 100644 --- a/gl/m4/stdint.m4 +++ b/gl/m4/stdint.m4 @@ -1,4 +1,4 @@ -# stdint.m4 serial 7 +# stdint.m4 serial 8 dnl Copyright (C) 2001-2002, 2004-2006 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -90,7 +90,7 @@ typedef int array [2 * (POW63 != 0 && POW64 == 0) - 1]; #if defined(__FreeBSD__) && (__FreeBSD__ >= 3) && (__FreeBSD__ <= 4) # include <sys/inttypes.h> #endif -#if defined(__OpenBSD__) +#if defined(__OpenBSD__) || defined(__sgi) # include <sys/types.h> # if HAVE_INTTYPES_H # include FULL_PATH_INTTYPES_H diff --git a/gl/stdint_.h b/gl/stdint_.h index 8fc8cebf52..dd21708123 100644 --- a/gl/stdint_.h +++ b/gl/stdint_.h @@ -33,11 +33,13 @@ #if defined(__FreeBSD__) && (__FreeBSD__ >= 3) && (__FreeBSD__ <= 4) # include <sys/inttypes.h> #endif -#if defined(__OpenBSD__) +#if defined(__OpenBSD__) || defined(__sgi) /* In OpenBSD 3.8, <sys/types.h> includes <machine/types.h>, which defines int{8,16,32,64}_t, uint{8,16,32,64}_t and __BIT_TYPES_DEFINED__. <inttypes.h> includes <machine/types.h> and also defines intptr_t and uintptr_t. */ + /* IRIX 6.5 has <inttypes.h>, and <sys/types.h> defines some of these + types as well. */ # include <sys/types.h> # if @HAVE_INTTYPES_H@ # include @FULL_PATH_INTTYPES_H@ @@ -924,21 +926,46 @@ typedef uint32_t uintmax_t; #if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) /* 7.18.4.1. Macros for minimum-width integer constants */ +/* According to ISO C 99 Technical Corrigendum 1 */ #undef INT8_C #undef UINT8_C #define INT8_C(x) x -#define UINT8_C(x) x##U +#if @HAVE_UINT8_T@ +# if @BITSIZEOF_UINT8_T@ < @BITSIZEOF_UNSIGNED_INT@ +# define UINT8_C(x) x +# else +# define UINT8_C(x) x##U +# endif +#else +# define UINT8_C(x) x +#endif #undef INT16_C #undef UINT16_C #define INT16_C(x) x -#define UINT16_C(x) x##U +#if @HAVE_UINT16_T@ +# if @BITSIZEOF_UINT16_T@ < @BITSIZEOF_UNSIGNED_INT@ +# define UINT16_C(x) x +# else +# define UINT16_C(x) x##U +# endif +#else +# define UINT16_C(x) x +#endif #undef INT32_C #undef UINT32_C #define INT32_C(x) x -#define UINT32_C(x) x##U +#if @HAVE_UINT32_T@ +# if @BITSIZEOF_UINT32_T@ < @BITSIZEOF_UNSIGNED_INT@ +# define UINT32_C(x) x +# else +# define UINT32_C(x) x##U +# endif +#else +# define UINT32_C(x) x +#endif #undef INT64_C #undef UINT64_C |