diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2013-10-08 20:50:28 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2013-10-08 20:50:28 (GMT) |
| commit | 6ea82c82744c295863b781b3d29f871cd8e4e27e (patch) | |
| tree | f34048e89f5890e6b83f5e6c99b96159a4af5666 /src/libircclient-1-fixes.patch | |
| parent | a66594b3715d045d455c8357d92adfd356a0dc40 (diff) | |
| download | mxe-6ea82c82744c295863b781b3d29f871cd8e4e27e.zip mxe-6ea82c82744c295863b781b3d29f871cd8e4e27e.tar.gz mxe-6ea82c82744c295863b781b3d29f871cd8e4e27e.tar.bz2 | |
update packages: cminpack file harfbuzz libircclient mpg123 netpbm
Diffstat (limited to 'src/libircclient-1-fixes.patch')
| -rw-r--r-- | src/libircclient-1-fixes.patch | 67 |
1 files changed, 14 insertions, 53 deletions
diff --git a/src/libircclient-1-fixes.patch b/src/libircclient-1-fixes.patch index da48eb5..b22e428 100644 --- a/src/libircclient-1-fixes.patch +++ b/src/libircclient-1-fixes.patch @@ -3,58 +3,19 @@ See index.html for further information. Contains ad hoc patches for cross building. -From 06b27e262de1d156ea31b52762ed372211b72de9 Mon Sep 17 00:00:00 2001 -From: MXE -Date: Mon, 23 Jan 2012 08:26:14 +0100 +From aab6124359bbf8d0b3003ccf4adc791e0d921aa3 Mon Sep 17 00:00:00 2001 +From: Mark Brand <mabrand@mabrand.nl> +Date: Tue, 8 Oct 2013 22:37:07 +0200 Subject: [PATCH 1/2] use the proper WIN32 define -diff --git a/examples/censor.cpp b/examples/censor.cpp -index 0c15f4c..c784040 100644 ---- a/examples/censor.cpp -+++ b/examples/censor.cpp -@@ -32,7 +32,7 @@ - #include <errno.h> - #include <string.h> - --#if !defined (WIN32) -+#if !defined (_WIN32) - #include <unistd.h> - #endif - -diff --git a/examples/irctest.c b/examples/irctest.c -index bd6dbc3..08d2ba7 100644 ---- a/examples/irctest.c -+++ b/examples/irctest.c -@@ -51,7 +51,7 @@ void addlog (const char * fmt, ...) - va_list va_alist; - - va_start (va_alist, fmt); --#if defined (WIN32) -+#if defined (_WIN32) - _vsnprintf (buf, sizeof(buf), fmt, va_alist); - #else - vsnprintf (buf, sizeof(buf), fmt, va_alist); -diff --git a/examples/spammer.c b/examples/spammer.c -index ae9c2c7..2a0861b 100644 ---- a/examples/spammer.c -+++ b/examples/spammer.c -@@ -17,7 +17,7 @@ - #include <errno.h> - #include <string.h> - --#if defined (WIN32) -+#if defined (_WIN32) - #include <windows.h> - - #define CREATE_THREAD(id,func,param) (CreateThread(0, 0, func, param, 0, id) == 0) diff --git a/include/libircclient.h b/include/libircclient.h -index 2dcd44c..af7d769 100644 +index 250a0d1..7ff83be 100644 --- a/include/libircclient.h +++ b/include/libircclient.h -@@ -44,7 +44,7 @@ - #ifndef INCLUDE_LIBIRC_H - #define INCLUDE_LIBIRC_H +@@ -46,7 +46,7 @@ + + #include <stdlib.h> -#if !defined (WIN32) +#if !defined (_WIN32) @@ -62,20 +23,20 @@ index 2dcd44c..af7d769 100644 #else #include <winsock2.h> -- -1.7.8.3 +1.8.1.4 -From 1a54c4dda67b99c1c0c0c68b45a395b741cb7030 Mon Sep 17 00:00:00 2001 -From: MXE -Date: Sun, 22 Jan 2012 22:39:23 +0100 +From 1ac4521bd869d7cb3a82640d44f80cb9f9388eb7 Mon Sep 17 00:00:00 2001 +From: Mark Brand <mabrand@mabrand.nl> +Date: Tue, 8 Oct 2013 22:37:29 +0200 Subject: [PATCH 2/2] fix missing header diff --git a/include/libircclient.h b/include/libircclient.h -index af7d769..57c8516 100644 +index 7ff83be..677f41f 100644 --- a/include/libircclient.h +++ b/include/libircclient.h -@@ -131,6 +131,7 @@ typedef void (*irc_dcc_callback_t) (irc_session_t * session, irc_dcc_t id, int s +@@ -133,6 +133,7 @@ typedef void (*irc_dcc_callback_t) (irc_session_t * session, irc_dcc_t id, int s #include "libirc_errors.h" #include "libirc_events.h" #include "libirc_options.h" @@ -84,5 +45,5 @@ index af7d769..57c8516 100644 -- -1.7.8.3 +1.8.1.4 |