Re: stdint module on SGI

[Bruno Haible]

Mark D. Baushke wrote:

> 2006-06-23  Larry Jones  <lawrence.jones@ugs.com>
> 
>       * stdint_.h: Try harder to find a definition of WCHAR_MIN/MAX.

Do you remember for which system this was necessary? IRIX or BSDI?

Bruno


*** m4/stdint.m4        26 Jun 2006 17:03:57 -0000      1.10
--- m4/stdint.m4        26 Jun 2006 17:22:31 -0000
***************
*** 9,14 ****
--- 9,23 ----
  
  AC_DEFUN([gl_STDINT_H],
  [
+   dnl Check for <wchar.h>.
+   AC_CHECK_HEADERS_ONCE([wchar.h])
+   if test $ac_cv_header_wchar_h = yes; then
+     HAVE_WCHAR_H=1
+   else
+     HAVE_WCHAR_H=0
+   fi
+   AC_SUBST([HAVE_WCHAR_H])
+ 
    dnl Check for <stdint.h> that doesn't clash with <sys/types.h>.
    gl_HEADER_STDINT_H
    if test $gl_cv_header_stdint_h = yes; then
*** modules/stdint      16 Jun 2006 13:29:51 -0000      1.6
--- modules/stdint      26 Jun 2006 17:22:31 -0000
***************
*** 22,28 ****
  # We need the following in order to create <stdint.h> when the system
  # doesn't have one that works with the given compiler.
  stdint.h: stdint_.h
!       sed -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
            -e 's|@''FULL_PATH_STDINT_H''@|$(FULL_PATH_STDINT_H)|g' \
            -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
            -e 's|@''FULL_PATH_INTTYPES_H''@|$(FULL_PATH_INTTYPES_H)|g' \
--- 22,29 ----
  # We need the following in order to create <stdint.h> when the system
  # doesn't have one that works with the given compiler.
  stdint.h: stdint_.h
!       sed -e 's/@''HAVE_WCHAR_H''@/$(HAVE_WCHAR_H)/g' \
!           -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
            -e 's|@''FULL_PATH_STDINT_H''@|$(FULL_PATH_STDINT_H)|g' \
            -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
            -e 's|@''FULL_PATH_INTTYPES_H''@|$(FULL_PATH_INTTYPES_H)|g' \
*** lib/stdint_.h       26 Jun 2006 17:03:57 -0000      1.21
--- lib/stdint_.h       26 Jun 2006 17:22:31 -0000
***************
*** 26,31 ****
--- 26,36 ----
  
  /* Get wchar_t, WCHAR_MIN, WCHAR_MAX.  */
  #include <stddef.h>
+ /* Some systems define WCHAR_MIN, WCHAR_MAX in <wchar.h>, not <stddef.h>.  */
+ #if !(defined(WCHAR_MIN) && defined(WCHAR_MAX)) && @HAVE_WCHAR_H@
+ # include <wchar.h>
+ #endif
+ 
  /* Get LONG_MIN, LONG_MAX, ULONG_MAX.  */
  #include <limits.h>