[svn] Merge of fix for bugs 20341 and 20410.

[wget] / src / sysdep.h

diff --git a/src/sysdep.h b/src/sysdep.h
index 9ac67a8e0919f8d928f5514a3a16218289716525..98b3c13bd8c6d1a0f5e3e725348e264099e59693 100644 (file)
--- a/src/sysdep.h
+++ b/src/sysdep.h
@@ -1,11 +1,11 @@
 /* Dirty system-dependent hacks.
-   Copyright (C) 1996-2005 Free Software Foundation, Inc.
+   Copyright (C) 1996-2006 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
 GNU Wget is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or (at
+the Free Software Foundation; either version 3 of the License, or (at
 your option) any later version.
 
 GNU Wget is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Wget; if not, write to the Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+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
@@ -210,4 +209,9 @@ typedef unsigned short uint32_t;
 typedef unsigned long uintptr_t;
 #endif
 
+/* If intptr_t isn't defined, simply typedef it to long. */
+#ifndef HAVE_INTPTR_T
+typedef long intptr_t;
+#endif
+
 #endif /* SYSDEP_H */