From a2ede97dc9231fae1b67e3396ceb323d42cc4a30 Mon Sep 17 00:00:00 2001
From: Michael Ow <mow@svn.icu-project.org>
Date: Tue, 23 Aug 2011 17:06:02 +0000
Subject: [PATCH] ICU-8765 Undo previous change to remove __STDC__ redefinition
 on Solaris GCC because it is required on older GCC compilers

X-SVN-Rev: 30568
---
 icu4c/source/aclocal.m4 | 7 ++++++-
 icu4c/source/configure  | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/icu4c/source/aclocal.m4 b/icu4c/source/aclocal.m4
index ac85afea80..95c9292337 100644
--- a/icu4c/source/aclocal.m4
+++ b/icu4c/source/aclocal.m4
@@ -454,7 +454,8 @@ AC_DEFUN(AC_CHECK_STRICT_COMPILE,
         then
             case "${host}" in
             *-*-solaris*)
-                CFLAGS="$CFLAGS -Wall -ansi -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -Wno-long-long";;
+                CFLAGS="$CFLAGS -Wall -ansi -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -Wno-long-long"
+                CFLAGS="$CFLAGS -D__STDC__=0";;
             *-*-hpux*)
                 echo "# Note: We are not using '-ansi' with HP/UX GCC because int64_t broke, see <http://bugs.icu-project.org/trac/ticket/8493>"
                 CFLAGS="$CFLAGS -Wall -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -Wno-long-long";;
@@ -473,6 +474,10 @@ AC_DEFUN(AC_CHECK_STRICT_COMPILE,
         if test "$GXX" = yes
         then
             CXXFLAGS="$CXXFLAGS -W -Wall -ansi -pedantic -Wpointer-arith -Wwrite-strings -Wno-long-long"
+            case "${host}" in
+            *-*-solaris*)
+                CXXFLAGS="$CXXFLAGS -D__STDC__=0";;
+            esac
         else
             case "${host}" in
             *-*-cygwin)
diff --git a/icu4c/source/configure b/icu4c/source/configure
index 0dfb4a63c1..6ebe468d3b 100755
--- a/icu4c/source/configure
+++ b/icu4c/source/configure
@@ -4315,7 +4315,8 @@ $as_echo "$ac_use_strict_options" >&6; }
         then
             case "${host}" in
             *-*-solaris*)
-                CFLAGS="$CFLAGS -Wall -ansi -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -Wno-long-long";;
+                CFLAGS="$CFLAGS -Wall -ansi -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -Wno-long-long"
+                CFLAGS="$CFLAGS -D__STDC__=0";;
             *-*-hpux*)
                 echo "# Note: We are not using '-ansi' with HP/UX GCC because int64_t broke, see <http://bugs.icu-project.org/trac/ticket/8493>"
                 CFLAGS="$CFLAGS -Wall -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -Wno-long-long";;
@@ -4334,6 +4335,10 @@ $as_echo "$ac_use_strict_options" >&6; }
         if test "$GXX" = yes
         then
             CXXFLAGS="$CXXFLAGS -W -Wall -ansi -pedantic -Wpointer-arith -Wwrite-strings -Wno-long-long"
+            case "${host}" in
+            *-*-solaris*)
+                CXXFLAGS="$CXXFLAGS -D__STDC__=0";;
+            esac
         else
             case "${host}" in
             *-*-cygwin)