From 4b7c7c2bb16f6278036f5aee6fb0b2c8f5ce38f2 Mon Sep 17 00:00:00 2001
From: Berke Viktor <bviktor@hexchat.org>
Date: Tue, 30 Oct 2012 07:25:40 +0100
Subject: Rebranding for XCHAT_FD_*

---
 plugins/dns/dns.c             |  2 +-
 plugins/lua/lua.c             |  8 ++++----
 plugins/perl/perl.c           | 10 +++++-----
 plugins/wmpa/hexchat-plugin.h |  8 ++++----
 4 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'plugins')

diff --git a/plugins/dns/dns.c b/plugins/dns/dns.c
index 2417b1d2..535d4b76 100644
--- a/plugins/dns/dns.c
+++ b/plugins/dns/dns.c
@@ -292,7 +292,7 @@ dns_cmd_cb (char *word[], char *word_eol[], void *ud)
 		if (thread_start (th, thread_function, th))
 		{
 			xchat_hook_fd(ph, th->pipe_fd[PIPE_READ],
-							XCHAT_FD_READ | XCHAT_FD_EXCEPTION | XCHAT_FD_NOTSOCKET,
+							HEXCHAT_FD_READ | HEXCHAT_FD_EXCEPTION | HEXCHAT_FD_NOTSOCKET,
 							(void *)dns_read_cb, th);
 
 		}
diff --git a/plugins/lua/lua.c b/plugins/lua/lua.c
index c5a7e338..ebd2c697 100644
--- a/plugins/lua/lua.c
+++ b/plugins/lua/lua.c
@@ -181,10 +181,10 @@ static struct {
 	{"EAT_ALL",		XCHAT_EAT_ALL},
 
 /* unused until hook_fd is done 
-	{"FD_READ",			XCHAT_FD_READ},
-	{"FD_WRITE",		XCHAT_FD_WRITE},
-	{"FD_EXCEPTION",	XCHAT_FD_EXCEPTION},
-	{"FD_NOTSOCKET",	XCHAT_FD_NOTSOCKET},
+	{"FD_READ",			HEXCHAT_FD_READ},
+	{"FD_WRITE",		HEXCHAT_FD_WRITE},
+	{"FD_EXCEPTION",	HEXCHAT_FD_EXCEPTION},
+	{"FD_NOTSOCKET",	HEXCHAT_FD_NOTSOCKET},
    */
 
 	{"PRI_HIGHEST", 	HEXCHAT_PRI_HIGHEST},
diff --git a/plugins/perl/perl.c b/plugins/perl/perl.c
index 1ecea703..f81dcdd5 100644
--- a/plugins/perl/perl.c
+++ b/plugins/perl/perl.c
@@ -1055,7 +1055,7 @@ XS (XS_Xchat_hook_fd)
 		data = NULL;
 
 #ifdef WIN32
-		if ((flags & XCHAT_FD_NOTSOCKET) == 0) {
+		if ((flags & HEXCHAT_FD_NOTSOCKET) == 0) {
 			/* this _get_osfhandle if from win32iop.h in the perl distribution,
 			 *  not the one provided by Windows
 			 */ 
@@ -1332,10 +1332,10 @@ xs_init (pTHX)
 	newCONSTSUB (stash, "EAT_XCHAT", newSViv (XCHAT_EAT_XCHAT));
 	newCONSTSUB (stash, "EAT_PLUGIN", newSViv (XCHAT_EAT_PLUGIN));
 	newCONSTSUB (stash, "EAT_ALL", newSViv (XCHAT_EAT_ALL));
-	newCONSTSUB (stash, "FD_READ", newSViv (XCHAT_FD_READ));
-	newCONSTSUB (stash, "FD_WRITE", newSViv (XCHAT_FD_WRITE));
-	newCONSTSUB (stash, "FD_EXCEPTION", newSViv (XCHAT_FD_EXCEPTION));
-	newCONSTSUB (stash, "FD_NOTSOCKET", newSViv (XCHAT_FD_NOTSOCKET));
+	newCONSTSUB (stash, "FD_READ", newSViv (HEXCHAT_FD_READ));
+	newCONSTSUB (stash, "FD_WRITE", newSViv (HEXCHAT_FD_WRITE));
+	newCONSTSUB (stash, "FD_EXCEPTION", newSViv (HEXCHAT_FD_EXCEPTION));
+	newCONSTSUB (stash, "FD_NOTSOCKET", newSViv (HEXCHAT_FD_NOTSOCKET));
 	newCONSTSUB (stash, "KEEP", newSViv (1));
 	newCONSTSUB (stash, "REMOVE", newSViv (0));
 
diff --git a/plugins/wmpa/hexchat-plugin.h b/plugins/wmpa/hexchat-plugin.h
index 55e2c0b3..fb398b3a 100644
--- a/plugins/wmpa/hexchat-plugin.h
+++ b/plugins/wmpa/hexchat-plugin.h
@@ -15,10 +15,10 @@
 #define HEXCHAT_PRI_LOW      (-64)
 #define HEXCHAT_PRI_LOWEST   (-128)
 
-#define XCHAT_FD_READ      1
-#define XCHAT_FD_WRITE     2
-#define XCHAT_FD_EXCEPTION 4
-#define XCHAT_FD_NOTSOCKET 8
+#define HEXCHAT_FD_READ      1
+#define HEXCHAT_FD_WRITE     2
+#define HEXCHAT_FD_EXCEPTION 4
+#define HEXCHAT_FD_NOTSOCKET 8
 
 #define XCHAT_EAT_NONE     0                                   /* pass it on through! */
 #define XCHAT_EAT_XCHAT    1                                   /* don't let xchat see this event */
-- 
cgit 1.4.1