Mercurial > pidgin

changeset 18450:8457bb35bf8c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '781654c3edc889471ddc7abfb81476b8ebf9daae' and '9c36b508590a62f17e5c424daf8da88bbbb20e2e'
author Sadrul Habib Chowdhury <imadil@gmail.com>
date Fri, 06 Jul 2007 21:48:50 +0000
parents ed17f5530300 (current diff) 4b1e2aefeb9d (diff)
children 7122bcebf7c9
files
diffstat 7 files changed, 13 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/plugins/perl/common/Makefile.mingw	Fri Jul 06 21:42:25 2007 +0000
+++ b/libpurple/plugins/perl/common/Makefile.mingw	Fri Jul 06 21:48:50 2007 +0000
@@ -20,6 +20,7 @@
 INCLUDE_PATHS +=		-I. \
 			-I$(PIDGIN_TREE_TOP) \
 			-I$(PURPLE_TOP) \
+			-I$(PURPLE_TOP)/win32 \
 			-I$(GTK_TOP)/include \
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
--- a/libpurple/plugins/perl/perl-common.h	Fri Jul 06 21:42:25 2007 +0000
+++ b/libpurple/plugins/perl/perl-common.h	Fri Jul 06 21:48:50 2007 +0000
@@ -11,7 +11,14 @@
 
 /* XXX: perl defines it's own _ but I think it's safe to undef it */
 #undef _
+/* Dirty hack to prevent the win32 libc compat stuff from interfering with the Perl internal stuff */
+#ifdef _WIN32
+#define _WIN32DEP_H_
+#endif
 #include "internal.h"
+#ifdef _WIN32
+#undef _WIN32DEP_H_
+#endif
 #include "plugin.h"
 #include "value.h"
 
--- a/libpurple/win32/win32dep.c	Fri Jul 06 21:42:25 2007 +0000
+++ b/libpurple/win32/win32dep.c	Fri Jul 06 21:48:50 2007 +0000
@@ -43,8 +43,6 @@
 /*
  *  DEFINES & MACROS
  */
-#define _(x) gettext(x)
-
 #define WIN32_PROXY_REGKEY "Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings"
 
 /* For shfolder.dll */
--- a/pidgin/gtkimhtml.c	Fri Jul 06 21:42:25 2007 +0000
+++ b/pidgin/gtkimhtml.c	Fri Jul 06 21:48:50 2007 +0000
@@ -28,8 +28,8 @@
 #include <config.h>
 #endif
 
+#include "internal.h"
 #include "pidgin.h"
-#include "internal.h"
 
 #include "debug.h"
 #include "util.h"
--- a/pidgin/plugins/perl/common/Makefile.mingw	Fri Jul 06 21:42:25 2007 +0000
+++ b/pidgin/plugins/perl/common/Makefile.mingw	Fri Jul 06 21:48:50 2007 +0000
@@ -18,6 +18,7 @@
 INCLUDE_PATHS =		-I. \
 			-I$(PIDGIN_TREE_TOP) \
 			-I$(PURPLE_TOP) \
+			-I$(PURPLE_TOP)/win32 \
 			-I$(PIDGIN_TOP) \
 			-I$(PIDGIN_TOP)/win32 \
 			-I$(GTK_TOP)/include \
--- a/pidgin/win32/gtkwin32dep.c	Fri Jul 06 21:42:25 2007 +0000
+++ b/pidgin/win32/gtkwin32dep.c	Fri Jul 06 21:48:50 2007 +0000
@@ -36,6 +36,8 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkwin32.h>
 
+#include "internal.h"
+
 #include "debug.h"
 #include "notify.h"
 
--- a/pidgin/win32/gtkwin32dep.h	Fri Jul 06 21:42:25 2007 +0000
+++ b/pidgin/win32/gtkwin32dep.h	Fri Jul 06 21:48:50 2007 +0000
@@ -45,5 +45,5 @@
 void winpidgin_post_init(void);
 void winpidgin_cleanup(void);
 
-#endif /* _WIN32DEP_H_ */
+#endif /* _GTKWIN32DEP_H_ */