Index: config/locale/generic/c_locale.cc
===================================================================
--- config/locale/generic/c_locale.cc	(revision 182019)
+++ config/locale/generic/c_locale.cc	(working copy)
@@ -52,8 +52,8 @@
     {
       // Assumes __s formatted for "C" locale.
       char* __old = setlocale(LC_ALL, 0);
-      char* __sav = NULL;
-      if (__old != NULL)
+      char* __sav = 0;
+      if (__old != 0)
         {
           const size_t __len = strlen(__old) + 1;
           __sav = new char[__len];
@@ -121,8 +121,8 @@
     {
       // Assumes __s formatted for "C" locale.
       char* __old = setlocale(LC_ALL, 0);
-      char* __sav = NULL;
-      if (__old != NULL)
+      char* __sav = 0;
+      if (__old != 0)
         {
           const size_t __len = strlen(__old) + 1;
           __sav = new char[__len];
@@ -170,8 +170,8 @@
     {
       // Assumes __s formatted for "C" locale.
       char* __old = setlocale(LC_ALL, 0);
-      char* __sav = NULL;
-      if (__old != NULL)
+      char* __sav = 0;
+      if (__old != 0)
         {
           const size_t __len = strlen(__old) + 1;
           __sav = new char[__len];
Index: config/locale/generic/c_locale.h
===================================================================
--- config/locale/generic/c_locale.h	(revision 182019)
+++ config/locale/generic/c_locale.h	(working copy)
@@ -60,7 +60,7 @@
   {
     char* __old = std::setlocale(LC_NUMERIC, 0);
     char* __sav = 0;
-    if (__old != NULL && __builtin_strcmp(__old, "C"))
+    if (__old != 0 && __builtin_strcmp(__old, "C"))
       {
 	const size_t __len = __builtin_strlen(__old) + 1;
 	__sav = new char[__len];
Index: config/locale/generic/time_members.cc
===================================================================
--- config/locale/generic/time_members.cc	(revision 182019)
+++ config/locale/generic/time_members.cc	(working copy)
@@ -45,8 +45,8 @@
 	   const tm* __tm) const throw()
     {
       char* __old = setlocale(LC_ALL, 0);
-      char* __sav = NULL;
-      if (__old != NULL)
+      char* __sav = 0;
+      if (__old != 0)
         {
           const size_t __llen = strlen(__old) + 1;
           __sav = new char[__llen];
@@ -134,8 +134,8 @@
 	   const tm* __tm) const throw()
     {
       char* __old = setlocale(LC_ALL, 0);
-      char* __sav = NULL;
-      if (__old != NULL)
+      char* __sav = 0;
+      if (__old != 0)
         {
           const size_t __llen = strlen(__old) + 1;
           __sav = new char[__llen];