Mercurial > mxe-octave

annotate src/libircclient-1-fixes.patch @ 2215:946797142f53

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
package libircclient: fix missing header
author Lothar May <lothar.imap@googlemail.com>
date Sun, 22 Jan 2012 22:44:44 +0100
parents 6e4cdfe9a828
children 4bc329dea0a2
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1898
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
1 This file is part of mingw-cross-env.
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
2 See doc/index.html for further information.
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
3
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
4 Contains ad hoc patches for cross building.
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
5
2215
946797142f53 package libircclient: fix missing header
Lothar May <lothar.imap@googlemail.com>
parents: 2214
diff changeset
6 From f959d621bbd143eba764a97605dc05c53340ea90 Mon Sep 17 00:00:00 2001
1898
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
7 From: mingw-cross-env
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
8 Date: Thu, 23 Jun 2011 15:47:52 +1000
2215
946797142f53 package libircclient: fix missing header
Lothar May <lothar.imap@googlemail.com>
parents: 2214
diff changeset
9 Subject: [PATCH 1/3] IPv6 support is broken and is forced to be disabled.
1898
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
10
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
11 This place is sufficient - IPv6 initialisation will now cause an error.
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
12
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
13 diff --git a/src/libircclient.c b/src/libircclient.c
2215
946797142f53 package libircclient: fix missing header
Lothar May <lothar.imap@googlemail.com>
parents: 2214
diff changeset
14 index 21a50de..69d2225 100644
1898
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
15 --- a/src/libircclient.c
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
16 +++ b/src/libircclient.c
2215
946797142f53 package libircclient: fix missing header
Lothar May <lothar.imap@googlemail.com>
parents: 2214
diff changeset
17 @@ -239,7 +239,7 @@ int irc_connect6 (irc_session_t * session,
1898
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
18 const char * username,
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
19 const char * realname)
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
20 {
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
21 -#if defined (ENABLE_IPV6)
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
22 +#if 0
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
23 struct sockaddr_in6 saddr;
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
24 struct addrinfo ainfo, *res = NULL;
2215
946797142f53 package libircclient: fix missing header
Lothar May <lothar.imap@googlemail.com>
parents: 2214
diff changeset
25 char portStr[32], *p;
1898
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
26 --
2215
946797142f53 package libircclient: fix missing header
Lothar May <lothar.imap@googlemail.com>
parents: 2214
diff changeset
27 1.7.8.3
1898
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
28
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
29
2215
946797142f53 package libircclient: fix missing header
Lothar May <lothar.imap@googlemail.com>
parents: 2214
diff changeset
30 From 86a3ef0fc754cb1fb25124414b32bcfc65d413d3 Mon Sep 17 00:00:00 2001
1898
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
31 From: mingw-cross-env
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
32 Date: Thu, 23 Jun 2011 15:48:33 +1000
2215
946797142f53 package libircclient: fix missing header
Lothar May <lothar.imap@googlemail.com>
parents: 2214
diff changeset
33 Subject: [PATCH 2/3] Use the proper WIN32 define.
1898
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
34
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
35
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
36 diff --git a/include/libircclient.h b/include/libircclient.h
2215
946797142f53 package libircclient: fix missing header
Lothar May <lothar.imap@googlemail.com>
parents: 2214
diff changeset
37 index 2dcd44c..af7d769 100644
1898
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
38 --- a/include/libircclient.h
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
39 +++ b/include/libircclient.h
2215
946797142f53 package libircclient: fix missing header
Lothar May <lothar.imap@googlemail.com>
parents: 2214
diff changeset
40 @@ -44,7 +44,7 @@
1898
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
41 #ifndef INCLUDE_LIBIRC_H
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
42 #define INCLUDE_LIBIRC_H
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
43
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
44 -#if !defined (WIN32)
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
45 +#if !defined (_WIN32)
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
46 #include <sys/select.h> /* fd_set */
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
47 #else
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
48 #include <winsock2.h>
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
49 diff --git a/src/portable.c b/src/portable.c
2215
946797142f53 package libircclient: fix missing header
Lothar May <lothar.imap@googlemail.com>
parents: 2214
diff changeset
50 index 81e0d7b..de85d27 100644
1898
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
51 --- a/src/portable.c
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
52 +++ b/src/portable.c
2215
946797142f53 package libircclient: fix missing header
Lothar May <lothar.imap@googlemail.com>
parents: 2214
diff changeset
53 @@ -12,7 +12,8 @@
946797142f53 package libircclient: fix missing header
Lothar May <lothar.imap@googlemail.com>
parents: 2214
diff changeset
54 * License for more details.
1898
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
55 */
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
56
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
57 -#if !defined (WIN32)
2215
946797142f53 package libircclient: fix missing header
Lothar May <lothar.imap@googlemail.com>
parents: 2214
diff changeset
58 +
1898
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
59 +#if !defined (_WIN32)
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
60 #include "config.h"
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
61 #include <stdio.h>
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
62 #include <stdarg.h>
2215
946797142f53 package libircclient: fix missing header
Lothar May <lothar.imap@googlemail.com>
parents: 2214
diff changeset
63 @@ -71,7 +72,7 @@
946797142f53 package libircclient: fix missing header
Lothar May <lothar.imap@googlemail.com>
parents: 2214
diff changeset
64 #if defined (ENABLE_THREADS)
1898
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
65 static inline int libirc_mutex_init (port_mutex_t * mutex)
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
66 {
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
67 -#if defined (WIN32)
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
68 +#if defined (_WIN32)
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
69 InitializeCriticalSection (mutex);
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
70 return 0;
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
71 #elif defined (PTHREAD_MUTEX_RECURSIVE)
2215
946797142f53 package libircclient: fix missing header
Lothar May <lothar.imap@googlemail.com>
parents: 2214
diff changeset
72 @@ -84,13 +85,13 @@ static inline int libirc_mutex_init (port_mutex_t * mutex)
1898
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
73
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
74 return pthread_mutex_init (mutex, 0);
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
75
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
76 -#endif /* defined (WIN32) */
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
77 +#endif /* defined (_WIN32) */
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
78 }
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
79
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
80
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
81 static inline void libirc_mutex_destroy (port_mutex_t * mutex)
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
82 {
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
83 -#if defined (WIN32)
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
84 +#if defined (_WIN32)
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
85 DeleteCriticalSection (mutex);
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
86 #else
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
87 pthread_mutex_destroy (mutex);
2215
946797142f53 package libircclient: fix missing header
Lothar May <lothar.imap@googlemail.com>
parents: 2214
diff changeset
88 @@ -100,7 +101,7 @@ static inline void libirc_mutex_destroy (port_mutex_t * mutex)
1898
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
89
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
90 static inline void libirc_mutex_lock (port_mutex_t * mutex)
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
91 {
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
92 -#if defined (WIN32)
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
93 +#if defined (_WIN32)
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
94 EnterCriticalSection (mutex);
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
95 #else
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
96 pthread_mutex_lock (mutex);
2215
946797142f53 package libircclient: fix missing header
Lothar May <lothar.imap@googlemail.com>
parents: 2214
diff changeset
97 @@ -110,7 +111,7 @@ static inline void libirc_mutex_lock (port_mutex_t * mutex)
1898
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
98
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
99 static inline void libirc_mutex_unlock (port_mutex_t * mutex)
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
100 {
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
101 -#if defined (WIN32)
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
102 +#if defined (_WIN32)
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
103 LeaveCriticalSection (mutex);
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
104 #else
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
105 pthread_mutex_unlock (mutex);
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
106 diff --git a/src/sockets.c b/src/sockets.c
2215
946797142f53 package libircclient: fix missing header
Lothar May <lothar.imap@googlemail.com>
parents: 2214
diff changeset
107 index 0925fed..0cbb14a 100644
1898
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
108 --- a/src/sockets.c
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
109 +++ b/src/sockets.c
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
110 @@ -15,7 +15,7 @@
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
111 /*
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
112 * The sockets interface was moved out to simplify going OpenSSL integration.
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
113 */
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
114 -#if !defined (WIN32)
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
115 +#if !defined (_WIN32)
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
116 #include <sys/socket.h>
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
117 #include <netdb.h>
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
118 #include <arpa/inet.h>
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
119 @@ -47,7 +47,7 @@
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
120
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
121 static int socket_error()
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
122 {
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
123 -#if !defined (WIN32)
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
124 +#if !defined (_WIN32)
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
125 return errno;
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
126 #else
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
127 return WSAGetLastError();
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
128 @@ -64,7 +64,7 @@ static int socket_create (int domain, int type, socket_t * sock)
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
129
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
130 static int socket_make_nonblocking (socket_t * sock)
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
131 {
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
132 -#if !defined (WIN32)
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
133 +#if !defined (_WIN32)
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
134 return fcntl (*sock, F_SETFL, fcntl (*sock, F_GETFL,0 ) | O_NONBLOCK) != 0;
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
135 #else
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
136 unsigned long mode = 0;
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
137 @@ -75,7 +75,7 @@ static int socket_make_nonblocking (socket_t * sock)
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
138
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
139 static int socket_close (socket_t * sock)
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
140 {
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
141 -#if !defined (WIN32)
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
142 +#if !defined (_WIN32)
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
143 close (*sock);
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
144 #else
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
145 closesocket (*sock);
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
146 --
2215
946797142f53 package libircclient: fix missing header
Lothar May <lothar.imap@googlemail.com>
parents: 2214
diff changeset
147 1.7.8.3
946797142f53 package libircclient: fix missing header
Lothar May <lothar.imap@googlemail.com>
parents: 2214
diff changeset
148
946797142f53 package libircclient: fix missing header
Lothar May <lothar.imap@googlemail.com>
parents: 2214
diff changeset
149
946797142f53 package libircclient: fix missing header
Lothar May <lothar.imap@googlemail.com>
parents: 2214
diff changeset
150 From 7f37c588aeeed6d3fdb7ed15c6d5e6f123b2a2a8 Mon Sep 17 00:00:00 2001
946797142f53 package libircclient: fix missing header
Lothar May <lothar.imap@googlemail.com>
parents: 2214
diff changeset
151 From: mingw-cross-env
946797142f53 package libircclient: fix missing header
Lothar May <lothar.imap@googlemail.com>
parents: 2214
diff changeset
152 Date: Sun, 22 Jan 2012 22:39:23 +0100
946797142f53 package libircclient: fix missing header
Lothar May <lothar.imap@googlemail.com>
parents: 2214
diff changeset
153 Subject: [PATCH 3/3] fix missing header
946797142f53 package libircclient: fix missing header
Lothar May <lothar.imap@googlemail.com>
parents: 2214
diff changeset
154
1898
92bda7c87fbe convert libircclient patches to patch-tool-mingw style
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
155
2215
946797142f53 package libircclient: fix missing header
Lothar May <lothar.imap@googlemail.com>
parents: 2214
diff changeset
156 diff --git a/include/libircclient.h b/include/libircclient.h
946797142f53 package libircclient: fix missing header
Lothar May <lothar.imap@googlemail.com>
parents: 2214
diff changeset
157 index af7d769..57c8516 100644
946797142f53 package libircclient: fix missing header
Lothar May <lothar.imap@googlemail.com>
parents: 2214
diff changeset
158 --- a/include/libircclient.h
946797142f53 package libircclient: fix missing header
Lothar May <lothar.imap@googlemail.com>
parents: 2214
diff changeset
159 +++ b/include/libircclient.h
946797142f53 package libircclient: fix missing header
Lothar May <lothar.imap@googlemail.com>
parents: 2214
diff changeset
160 @@ -131,6 +131,7 @@ typedef void (*irc_dcc_callback_t) (irc_session_t * session, irc_dcc_t id, int s
946797142f53 package libircclient: fix missing header
Lothar May <lothar.imap@googlemail.com>
parents: 2214
diff changeset
161 #include "libirc_errors.h"
946797142f53 package libircclient: fix missing header
Lothar May <lothar.imap@googlemail.com>
parents: 2214
diff changeset
162 #include "libirc_events.h"
946797142f53 package libircclient: fix missing header
Lothar May <lothar.imap@googlemail.com>
parents: 2214
diff changeset
163 #include "libirc_options.h"
946797142f53 package libircclient: fix missing header
Lothar May <lothar.imap@googlemail.com>
parents: 2214
diff changeset
164 +#include "libirc_rfcnumeric.h"
946797142f53 package libircclient: fix missing header
Lothar May <lothar.imap@googlemail.com>
parents: 2214
diff changeset
165 #undef IN_INCLUDE_LIBIRC_H
946797142f53 package libircclient: fix missing header
Lothar May <lothar.imap@googlemail.com>
parents: 2214
diff changeset
166
946797142f53 package libircclient: fix missing header
Lothar May <lothar.imap@googlemail.com>
parents: 2214
diff changeset
167
946797142f53 package libircclient: fix missing header
Lothar May <lothar.imap@googlemail.com>
parents: 2214
diff changeset
168 --
946797142f53 package libircclient: fix missing header
Lothar May <lothar.imap@googlemail.com>
parents: 2214
diff changeset
169 1.7.8.3
946797142f53 package libircclient: fix missing header
Lothar May <lothar.imap@googlemail.com>
parents: 2214
diff changeset
170