summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Helleu <flashcode@flashtux.org>2013-04-12 12:47:42 +0200
committerSebastien Helleu <flashcode@flashtux.org>2013-04-12 12:47:42 +0200
commitd70532250bb679dd480afa8a231a293e9c43ffc3 (patch)
tree9c6e6523d18a991805b04865abdf48334a852148
parentfe6cb5c1b3abb11a4c576f62256c2979c764e7bc (diff)
downloadweechat-d70532250bb679dd480afa8a231a293e9c43ffc3.zip
api: fix connection to servers with hook_connect on OS X (bug #38496)
-rw-r--r--ChangeLog3
-rw-r--r--src/core/wee-hook.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index da6eec25b..815a010ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
WeeChat ChangeLog
=================
Sébastien Helleu <flashcode@flashtux.org>
-v0.4.1-dev, 2013-04-10
+v0.4.1-dev, 2013-04-12
This document lists all changes for each version.
@@ -33,6 +33,7 @@ Version 0.4.1 (under dev!)
weechat.history.max_buffer_lines_minutes is set (bug #38197)
* core: use default hash/comparison callback for keys of type
integer/pointer/time in hashtable
+* api: fix connection to servers with hook_connect on OS X (bug #38496)
* api: fix bug in string_match when mask begins and ends with "*"
* api: allow hashtable with keys that are not strings in function
hashtable_add_to_infolist
diff --git a/src/core/wee-hook.h b/src/core/wee-hook.h
index 330be0dd3..4867286c7 100644
--- a/src/core/wee-hook.h
+++ b/src/core/wee-hook.h
@@ -27,7 +27,7 @@
#include <gnutls/gnutls.h>
#endif
-#ifdef __CYGWIN__
+#if defined(__CYGWIN__) || defined(__APPLE__) || defined(__MACH__)
/*
* For the connect hook, when this is defined an array of sockets will
* be passed from the parent process to the child process instead of using