Return-Path: X-Original-To: apmail-stdcxx-commits-archive@www.apache.org Delivered-To: apmail-stdcxx-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 965DDDC8C for ; Fri, 28 Sep 2012 23:16:12 +0000 (UTC) Received: (qmail 94339 invoked by uid 500); 28 Sep 2012 23:16:12 -0000 Delivered-To: apmail-stdcxx-commits-archive@stdcxx.apache.org Received: (qmail 94292 invoked by uid 500); 28 Sep 2012 23:16:12 -0000 Mailing-List: contact commits-help@stdcxx.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@stdcxx.apache.org Delivered-To: mailing list commits@stdcxx.apache.org Received: (qmail 94285 invoked by uid 99); 28 Sep 2012 23:16:12 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Sep 2012 23:16:11 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Sep 2012 23:16:09 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C893323888FE for ; Fri, 28 Sep 2012 23:15:25 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1391692 - in /stdcxx/branches/4.2.x: src/setlocale.cpp util/path.cpp Date: Fri, 28 Sep 2012 23:15:25 -0000 To: commits@stdcxx.apache.org From: lnicoara@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120928231525.C893323888FE@eris.apache.org> 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 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 -#if defined (__linux__) && !defined (_XOPEN_SOURCE) - // need S_IFDIR on Linux -# define _XOPEN_SOURCE -#endif // __linux__ && !_XOPEN_SOURCE - #include // for setlocale() #include // for getenv() #include // 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 // for getcwd() # include // for struct stat, stat() #else