Dependency improvements (but still needs some work).

[wget] / src / mswindows.h

diff --git a/src/mswindows.h b/src/mswindows.h
index 34352877074103b3707011f199435446bbd168ff..54821a7c63de203de090fa3add0466aefccf2f7d 100644 (file)
--- a/src/mswindows.h
+++ b/src/mswindows.h
@@ -1,11 +1,12 @@
 /* Declarations for windows
 /* Declarations for windows

-   Copyright (C) 1996-2005 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+   2004, 2005, 2006, 2007, 2008 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
 
 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
+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,
 (at your option) any later version.
 
 GNU Wget is distributed in the hope that it will be useful,


@@ -14,18 +15,18 @@ 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
 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.
-
-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.  */
+along with Wget.  If not, see <http://www.gnu.org/licenses/>.
+
+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.  */

 
 #ifndef MSWINDOWS_H
 #define MSWINDOWS_H
 
 #ifndef MSWINDOWS_H
 #define MSWINDOWS_H


@@ -59,6 +60,9 @@ so, delete this exception statement from your version.  */
    chmod.  Unix declares these in unistd.h and fcntl.h.  */
 #include <io.h>
 
    chmod.  Unix declares these in unistd.h and fcntl.h.  */
 #include <io.h>
 

+/* Declares getpid(). */
+#include <process.h>
+

 #ifndef S_ISDIR
 # define S_ISDIR(m) (((m) & (_S_IFMT)) == (_S_IFDIR))
 #endif
 #ifndef S_ISDIR
 # define S_ISDIR(m) (((m) & (_S_IFMT)) == (_S_IFDIR))
 #endif


@@ -81,17 +85,17 @@ so, delete this exception statement from your version.  */
 /* Define a wgint type under Windows. */
 typedef __int64 wgint;
 #define SIZEOF_WGINT 8
 /* Define a wgint type under Windows. */
 typedef __int64 wgint;
 #define SIZEOF_WGINT 8

-#define WGINT_MAX LL (9223372036854775807)

 
 

-/* str_to_wgint is a function with the semantics of strtol, but which
-   works on wgint.  */
+/* str_to_wgint is a function with the semantics of strtol[l], but
+   which works on wgint.  */

 #if defined HAVE_STRTOLL
 # define str_to_wgint strtoll
 #elif defined HAVE__STRTOI64
 # define str_to_wgint _strtoi64
 #else
 #if defined HAVE_STRTOLL
 # define str_to_wgint strtoll
 #elif defined HAVE__STRTOI64
 # define str_to_wgint _strtoi64
 #else

-__int64 str_to_int64 (const char *, char **, int);
-# define str_to_wgint str_to_int64
+# define str_to_wgint strtoll
+# define NEED_STRTOLL
+# define strtoll_type __int64

 #endif
 
 /* Windows has no symlink, therefore no lstat.  Without symlinks lstat
 #endif
 
 /* Windows has no symlink, therefore no lstat.  Without symlinks lstat


@@ -205,6 +209,6 @@ void ws_startup (void);
 void ws_changetitle (const char *);
 void ws_percenttitle (double);
 char *ws_mypath (void);
 void ws_changetitle (const char *);
 void ws_percenttitle (double);
 char *ws_mypath (void);

-void windows_main (int *, char **, char **);
+void windows_main (char **);

 
 #endif /* MSWINDOWS_H */
 
 #endif /* MSWINDOWS_H */