X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=src%2Fsysdep.h;h=0377029e6e77f5d9b037ab6c787e11be2e979e79;hp=fe48925b9eec4c8c220c0a187d7d8e897bb10ba6;hb=d763f8bf6d6e13ce006ffab616cc8a77e747a633;hpb=cb155a6b5d2fd10b8b935c22de82f26c35614a17

diff --git a/src/sysdep.h b/src/sysdep.h
index fe48925b..0377029e 100644
--- a/src/sysdep.h
+++ b/src/sysdep.h
@@ -1,6 +1,6 @@
 /* Dirty system-dependent hacks.
    Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+   2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
@@ -17,15 +17,16 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with Wget.  If not, see <http://www.gnu.org/licenses/>.
 
-In addition, as a special exception, the Free Software Foundation
-gives permission to link the code of its release of Wget with the
-OpenSSL project's "OpenSSL" library (or with modified versions of it
-that use the same license as the "OpenSSL" library), and distribute
-the linked executables.  You must obey the GNU General Public License
-in all respects for all of the code used other than "OpenSSL".  If you
-modify this file, you may extend this exception to your version of the
-file, but you are not obligated to do so.  If you do not wish to do
-so, delete this exception statement from your version.  */
+Additional permission under GNU GPL version 3 section 7
+
+If you modify this program, or any covered work, by linking or
+combining it with the OpenSSL project's OpenSSL library (or a
+modified version of that library), containing parts covered by the
+terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
+grants you additional permission to convey the resulting work.
+Corresponding Source for a non-source form of such a combination
+shall include the source code for the parts of OpenSSL used as well
+as that of the covered work.  */
 
 /* This file is included by wget.h.  Random .c files need not include
    it.  */
@@ -40,6 +41,10 @@ so, delete this exception statement from your version.  */
 # endif
 #endif
 
+#if defined(__INTERIX) && !defined(_ALL_SOURCE)
+# define _ALL_SOURCE
+#endif
+
 /* The "namespace tweaks" below attempt to set a friendly "compilation
    environment" under popular operating systems.  Default compilation
    environment often means that some functions that are "extensions"
@@ -56,7 +61,7 @@ so, delete this exception statement from your version.  */
 # define NAMESPACE_TWEAKS
 #endif
 
-#ifdef __linux__
+#if defined(__linux__) || defined(__GLIBC__)
 # define NAMESPACE_TWEAKS
 #endif
 
@@ -67,7 +72,7 @@ so, delete this exception statement from your version.  */
 
 /* For Solaris: request everything else that is available and doesn't
    conflict with the above.  */
-#define __EXTENSIONS__
+/* #define __EXTENSIONS__ */ /* XXX clashes with config.h */
 
 /* For Linux: request features of 4.3BSD and SVID (System V Interface
    Definition). */
@@ -77,7 +82,7 @@ so, delete this exception statement from your version.  */
 /* Under glibc-based systems we want all GNU extensions as well.  This
    declares some unnecessary cruft, but also useful functions such as
    timegm, FNM_CASEFOLD extension to fnmatch, memrchr, etc.  */
-#define _GNU_SOURCE
+/* #define _GNU_SOURCE */ /* XXX clashes with config.h */
 
 #endif /* NAMESPACE_TWEAKS */