Author: chiiph Date: 2011-03-19 22:15:48 +0000 (Sat, 19 Mar 2011) New Revision: 4535
Modified: vidalia/trunk/CMakeLists.txt vidalia/trunk/INSTALL vidalia/trunk/config.h.in vidalia/trunk/src/miniupnpc/connecthostport.c vidalia/trunk/src/miniupnpc/miniupnpc.c vidalia/trunk/src/miniupnpc/miniwget.c Log: Add support for win2k
Modified: vidalia/trunk/CMakeLists.txt =================================================================== --- vidalia/trunk/CMakeLists.txt 2011-03-19 21:57:33 UTC (rev 4534) +++ vidalia/trunk/CMakeLists.txt 2011-03-19 22:15:48 UTC (rev 4535) @@ -90,6 +90,9 @@ endif(OSX_FORCE_32BIT) endif(APPLE)
+## Define if compiled with Windows 2k support +option(WIN2K "Enable Windows 2k support." OFF) + ## UPnP support is currently optional (enabled by default) option(USE_MINIUPNPC "Enable UPnP support using the MiniUPnPc library." ON)
Modified: vidalia/trunk/INSTALL =================================================================== --- vidalia/trunk/INSTALL 2011-03-19 21:57:33 UTC (rev 4534) +++ vidalia/trunk/INSTALL 2011-03-19 22:15:48 UTC (rev 4535) @@ -83,7 +83,16 @@ You would replace "C:\Qt\4.3.2\bin" in the previous command with the actual path to your Qt installation's qmake.exe binary.
+If you are trying to build Vidalia for Windows 2000 and earlier, you should +download Windows SDK, copy wspiapi.h header to MinGW include directory and +build vidalia running:
+ cmake -DWIN2K .. + +Note: the header as it is in the SDK needs a "_inline" to be replaced to +"__inline" for it to build properly. + + Windows with Visual Studio -------------------------- Starting with Qt 4.3.2, the open source editions of Qt/Win include support for
Modified: vidalia/trunk/config.h.in =================================================================== --- vidalia/trunk/config.h.in 2011-03-19 21:57:33 UTC (rev 4534) +++ vidalia/trunk/config.h.in 2011-03-19 22:15:48 UTC (rev 4535) @@ -42,5 +42,7 @@
#cmakedefine USE_GEOIP
+#cmakedefine WIN2K + #endif
Modified: vidalia/trunk/src/miniupnpc/connecthostport.c =================================================================== --- vidalia/trunk/src/miniupnpc/connecthostport.c 2011-03-19 21:57:33 UTC (rev 4534) +++ vidalia/trunk/src/miniupnpc/connecthostport.c 2011-03-19 22:15:48 UTC (rev 4535) @@ -14,6 +14,10 @@ #ifdef WIN32 #include <winsock2.h> #include <ws2tcpip.h> +#ifdef WIN2K +# define __inline static inline +# include <wspiapi.h> +#endif #include <io.h> #define snprintf _snprintf #define herror
Modified: vidalia/trunk/src/miniupnpc/miniupnpc.c =================================================================== --- vidalia/trunk/src/miniupnpc/miniupnpc.c 2011-03-19 21:57:33 UTC (rev 4534) +++ vidalia/trunk/src/miniupnpc/miniupnpc.c 2011-03-19 22:15:48 UTC (rev 4535) @@ -27,6 +27,10 @@ /* Win32 Specific includes and defines */ #include <winsock2.h> #include <ws2tcpip.h> +#ifdef WIN2K +# define __inline static inline +# include <wspiapi.h> +#endif #include <io.h> /*#include <IPHlpApi.h>*/ #define snprintf _snprintf
Modified: vidalia/trunk/src/miniupnpc/miniwget.c =================================================================== --- vidalia/trunk/src/miniupnpc/miniwget.c 2011-03-19 21:57:33 UTC (rev 4534) +++ vidalia/trunk/src/miniupnpc/miniwget.c 2011-03-19 22:15:48 UTC (rev 4535) @@ -12,6 +12,10 @@ #ifdef WIN32 #include <winsock2.h> #include <ws2tcpip.h> +#ifdef WIN2K +# define __inline static inline +# include <wspiapi.h> +#endif #include <io.h> #define MAXHOSTNAMELEN 64 #define MIN(x,y) (((x)<(y))?(x):(y))