X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fmbstate_t.m4;h=3e2df29f8aa13b71eb4038480ce3c85d25fdbb3c;hb=c47e73f47733362996652ecbb683347920a183b6;hp=ac47f11b2504931b91db8c65ddd0184e3b4128d9;hpb=5d23e464e2e7293696b9fc6a63a8bc5f8d19da8c;p=gnulib.git

diff --git a/m4/mbstate_t.m4 b/m4/mbstate_t.m4
index ac47f11b2..3e2df29f8 100644
--- a/m4/mbstate_t.m4
+++ b/m4/mbstate_t.m4
@@ -1,43 +1,34 @@
-# serial 6
+# mbstate_t.m4 serial 12
+dnl Copyright (C) 2000-2002, 2008-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 # From Paul Eggert.
 
-# Some versions of BeOS define mbstate_t to be an incomplete type,
+# BeOS 5 has <wchar.h> but does not define mbstate_t,
 # so you can't declare an object of that type.
 # Check for this incompatibility with Standard C.
 
-# Include stdlib.h first, because otherwise this test would fail on Linux
-# (at least glibc-2.1.3) because the `_XOPEN_SOURCE 500' definition elicits
-# a syntax error in wchar.h due to the use of undefined __int32_t.
+# AC_TYPE_MBSTATE_T
+# -----------------
+AC_DEFUN([AC_TYPE_MBSTATE_T],
+[
+   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) dnl for HP-UX 11.11
 
-AC_DEFUN(AC_MBSTATE_T_OBJECT,
-  [
-   AC_CHECK_HEADERS(stdlib.h)
-
-   AC_CACHE_CHECK([for mbstate_t object], ac_cv_type_mbstate_t_object,
-    [AC_TRY_COMPILE([
-#if HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-#include <wchar.h>],
-      [mbstate_t x; return sizeof x;],
-      ac_cv_type_mbstate_t_object=yes,
-      ac_cv_type_mbstate_t_object=no)])
-   if test $ac_cv_type_mbstate_t_object = yes; then
-     AC_DEFINE(HAVE_MBSTATE_T_OBJECT, 1,
-	       [Define if mbstate_t is an object type.])
+   AC_CACHE_CHECK([for mbstate_t], [ac_cv_type_mbstate_t],
+     [AC_COMPILE_IFELSE(
+        [AC_LANG_PROGRAM(
+           [AC_INCLUDES_DEFAULT[
+#           include <wchar.h>]],
+           [[mbstate_t x; return sizeof x;]])],
+        [ac_cv_type_mbstate_t=yes],
+        [ac_cv_type_mbstate_t=no])])
+   if test $ac_cv_type_mbstate_t = yes; then
+     AC_DEFINE([HAVE_MBSTATE_T], [1],
+               [Define to 1 if <wchar.h> declares mbstate_t.])
    else
-     AC_CACHE_CHECK([for mbstate_t], ac_cv_type_mbstate_t,
-      [AC_TRY_COMPILE([
-#if HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-#include <wchar.h>],
-	[mbstate_t *x; return sizeof x;],
-	ac_cv_type_mbstate_t=yes,
-	ac_cv_type_mbstate_t=no)])
-     if test $ac_cv_type_mbstate_t != yes; then
-       AC_DEFINE(mbstate_t, int,
-		 [Define to int if <wchar.h> does not define.])
-     fi
-   fi])
+     AC_DEFINE([mbstate_t], [int],
+               [Define to a type if <wchar.h> does not define.])
+   fi
+])