moparisthebest/hexchat
1
0
Fork 0
mirror of https://github.com/moparisthebest/hexchat synced 2024-11-26 03:02:17 -05:00
Code Issues Releases Wiki Activity

some cleanup related to winsock

Browse Source
This commit is contained in:
berkeviktor@aol.com 2010-08-12 01:08:52 +02:00
parent bc36659aed
commit 9333d7e925
1 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
xchat-wdk.patch
View File

@ -261,7 +261,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/inbound.c xchat-wdk/src/
#define WANTARPA #define WANTARPA
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/inet.h xchat-wdk/src/common/inet.h diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/inet.h xchat-wdk/src/common/inet.h
--- xchat-wdk.orig/src/common/inet.h 2005-09-03 12:57:48 +0200 --- xchat-wdk.orig/src/common/inet.h 2005-09-03 12:57:48 +0200
+++ xchat-wdk/src/common/inet.h 2010-08-10 16:29:30 +0200 +++ xchat-wdk/src/common/inet.h 2010-08-12 01:00:09 +0200
@@ -24,9 +24,8 @@ @@ -24,9 +24,8 @@
#ifdef USE_IPV6 #ifdef USE_IPV6
#include <winsock2.h> #include <winsock2.h>
@ -370,18 +370,21 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/servlist.c xchat-wdk/src
#include <glib/ghash.h> #include <glib/ghash.h>
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/ssl.c xchat-wdk/src/common/ssl.c diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/ssl.c xchat-wdk/src/common/ssl.c
--- xchat-wdk.orig/src/common/ssl.c 2007-03-28 10:35:06 +0200 --- xchat-wdk.orig/src/common/ssl.c 2007-03-28 10:35:06 +0200
+++ xchat-wdk/src/common/ssl.c 2010-08-10 16:29:30 +0200 +++ xchat-wdk/src/common/ssl.c 2010-08-12 00:55:22 +0200
@@ -17,6 +17,10 @@ @@ -17,12 +17,12 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/ */
+/*#define _WS2DEF_ +#include "inet.h" /* make it first to avoid macro redefinitions */
+#define _WINSOCK2API_
+#define _WS2TCPIP_H_*/
+#include <winsock2.h>
#include <openssl/ssl.h> /* SSL_() */ #include <openssl/ssl.h> /* SSL_() */
#include <openssl/err.h> /* ERR_() */ #include <openssl/err.h> /* ERR_() */
#include <time.h> /* asctime() */ #include <time.h> /* asctime() */
#include <string.h> /* strncpy() */
#include "ssl.h" /* struct cert_info */
-#include "inet.h"
#include "../../config.h" /* HAVE_SNPRINTF */
#ifndef HAVE_SNPRINTF
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/text.c xchat-wdk/src/common/text.c diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/text.c xchat-wdk/src/common/text.c
--- xchat-wdk.orig/src/common/text.c 2010-05-30 04:28:04 +0200 --- xchat-wdk.orig/src/common/text.c 2010-05-30 04:28:04 +0200
+++ xchat-wdk/src/common/text.c 2010-08-10 16:29:30 +0200 +++ xchat-wdk/src/common/text.c 2010-08-10 16:29:30 +0200
@ -456,13 +459,15 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/text.c xchat-wdk/src/com
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/util.c xchat-wdk/src/common/util.c diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/util.c xchat-wdk/src/common/util.c
--- xchat-wdk.orig/src/common/util.c 2008-02-07 02:50:37 +0100 --- xchat-wdk.orig/src/common/util.c 2008-02-07 02:50:37 +0100
+++ xchat-wdk/src/common/util.c 2010-08-10 16:29:30 +0200 +++ xchat-wdk/src/common/util.c 2010-08-12 01:05:46 +0200
@@ -17,10 +17,11 @@ @@ -16,11 +16,13 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/ */
+#define WANTSOCKET
+#include "inet.h" /* make it first to avoid macro redefinitions */
+
#define __APPLE_API_STRICT_CONFORMANCE #define __APPLE_API_STRICT_CONFORMANCE
+#define _WINSOCK2API_
+#define _WS2TCPIP_H_
#define _FILE_OFFSET_BITS 64 #define _FILE_OFFSET_BITS 64
#include <stdio.h> #include <stdio.h>
@ -470,7 +475,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/util.c xchat-wdk/src/com
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <sys/types.h> #include <sys/types.h>
@@ -35,7 +36,7 @@ @@ -35,7 +37,7 @@
#include <sys/utsname.h> #include <sys/utsname.h>
#endif #endif
#include <fcntl.h> #include <fcntl.h>
@ -479,7 +484,17 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/util.c xchat-wdk/src/com
#include <errno.h> #include <errno.h>
#include "xchat.h" #include "xchat.h"
#include "xchatc.h" #include "xchatc.h"
@@ -54,9 +55,11 @@ @@ -44,9 +46,6 @@
#include "util.h"
#include "../../config.h"
-#define WANTSOCKET
-#include "inet.h"
-
#if defined (USING_FREEBSD) || defined (__APPLE__)
#include <sys/sysctl.h>
#endif
@@ -54,9 +53,11 @@
#include <socks.h> #include <socks.h>
#endif #endif
@ -491,7 +506,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/util.c xchat-wdk/src/com
#ifdef USE_DEBUG #ifdef USE_DEBUG
@@ -631,22 +634,32 @@ @@ -631,22 +632,32 @@
OSVERSIONINFO osvi; OSVERSIONINFO osvi;
SYSTEM_INFO si; SYSTEM_INFO si;
double mhz; double mhz;