stdcxx-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lnico...@apache.org
Subject svn commit: r1391692 - in /stdcxx/branches/4.2.x: src/setlocale.cpp util/path.cpp
Date Fri, 28 Sep 2012 23:15:25 GMT
Author: lnicoara
Date: Fri Sep 28 23:15:23 2012
New Revision: 1391692

URL: http://svn.apache.org/viewvc?rev=1391692&view=rev
Log:
2012-09-28  Liviu Nicoara  <lnicoara@apache.org>

Definitions of _XOPEN_SOURCE and _XOPEN_SOURCE_EXTENDED interfere with
the includes in Linux system headers such that Oracle/Sun compiler
headers are inadvertently included in a circular fashion. Removing the
definitions which are not needed on modern Linux, anyway.

    * src/setlocale.cpp (_XOPEN_SOURCE): removed definition.
    * util/path.cpp (_XOPEN_SOURCE): same. (_XOPEN_SOURCE_EXTENDED):
      same.


Modified:
    stdcxx/branches/4.2.x/src/setlocale.cpp
    stdcxx/branches/4.2.x/util/path.cpp

Modified: stdcxx/branches/4.2.x/src/setlocale.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/src/setlocale.cpp?rev=1391692&r1=1391691&r2=1391692&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/src/setlocale.cpp (original)
+++ stdcxx/branches/4.2.x/src/setlocale.cpp Fri Sep 28 23:15:23 2012
@@ -33,11 +33,6 @@
 
 #include <rw/_defs.h>
 
-#if defined (__linux__) && !defined (_XOPEN_SOURCE)
-   // need S_IFDIR on Linux
-#  define _XOPEN_SOURCE 
-#endif   // __linux__ && !_XOPEN_SOURCE
-
 #include <locale.h>   // for setlocale()
 #include <stdlib.h>   // for getenv()
 #include <string.h>   // for memcpy(), strcmp()

Modified: stdcxx/branches/4.2.x/util/path.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/util/path.cpp?rev=1391692&r1=1391691&r2=1391692&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/util/path.cpp (original)
+++ stdcxx/branches/4.2.x/util/path.cpp Fri Sep 28 23:15:23 2012
@@ -27,16 +27,6 @@
  **************************************************************************/
 
 #ifndef _WIN32
-#  ifdef __linux__
-     // for symlink()
-#    ifndef _XOPEN_SOURCE
-#      define _XOPEN_SOURCE
-#    endif
-#    ifndef _XOPEN_SOURCE_EXTENDED
-#      define _XOPEN_SOURCE_EXTENDED
-#    endif
-#  endif   // __linux__
-
 #  include <unistd.h>      // for getcwd()
 #  include <sys/stat.h>    // for struct stat, stat()
 #else



Mime
View raw message