From aeb5d15871cca7fe5eba806431b4e63fee015a94 Mon Sep 17 00:00:00 2001
From: TingPing <tingping@tingping.se>
Date: Mon, 15 Dec 2014 22:57:27 -0500
Subject: More consistently include config.h

---
 plugins/checksum/checksum.c      | 2 ++
 plugins/doat/doat.c              | 2 ++
 plugins/fishlim/irc.c            | 2 ++
 plugins/fishlim/keystore.c       | 2 ++
 plugins/fishlim/plugin_hexchat.c | 2 ++
 plugins/perl/perl.c              | 2 +-
 plugins/perl/perl.vcxproj        | 4 ++--
 plugins/python/python.c          | 6 ++++--
 plugins/sysinfo/xsys.c           | 1 +
 9 files changed, 18 insertions(+), 5 deletions(-)

(limited to 'plugins')

diff --git a/plugins/checksum/checksum.c b/plugins/checksum/checksum.c
index 7e2d8a4e..9a7f0ebd 100644
--- a/plugins/checksum/checksum.c
+++ b/plugins/checksum/checksum.c
@@ -20,6 +20,8 @@
  * THE SOFTWARE.
  */
 
+#include "config.h"
+
 #include <stdlib.h>
 #include <glib.h>
 #include <glib/gstdio.h>
diff --git a/plugins/doat/doat.c b/plugins/doat/doat.c
index 194be1a3..5e0aa4eb 100644
--- a/plugins/doat/doat.c
+++ b/plugins/doat/doat.c
@@ -5,6 +5,8 @@
  * http://sam.zoy.org/wtfpl/COPYING or http://lwsitu.com/xchat/COPYING
  * for more details. */
 
+#include "config.h"
+
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/plugins/fishlim/irc.c b/plugins/fishlim/irc.c
index 2ed23f41..9bd84769 100644
--- a/plugins/fishlim/irc.c
+++ b/plugins/fishlim/irc.c
@@ -22,6 +22,8 @@
 
 */
 
+#include "config.h"
+
 #include <glib.h>
 #include "irc.h"
 
diff --git a/plugins/fishlim/keystore.c b/plugins/fishlim/keystore.c
index 8cb12912..caad3628 100644
--- a/plugins/fishlim/keystore.c
+++ b/plugins/fishlim/keystore.c
@@ -22,6 +22,8 @@
 
 */
 
+#include "config.h"
+
 #include <glib.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/plugins/fishlim/plugin_hexchat.c b/plugins/fishlim/plugin_hexchat.c
index 19a0d58f..67866021 100644
--- a/plugins/fishlim/plugin_hexchat.c
+++ b/plugins/fishlim/plugin_hexchat.c
@@ -22,6 +22,8 @@
 
 */
 
+#include "config.h"
+
 #include <glib.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/plugins/perl/perl.c b/plugins/perl/perl.c
index eb539902..9bf4f874 100644
--- a/plugins/perl/perl.c
+++ b/plugins/perl/perl.c
@@ -32,7 +32,7 @@
 #endif
 
 #undef PACKAGE
-#include "../../config.h"
+#include "config.h"
 
 #include "hexchat-plugin.h"
 
diff --git a/plugins/perl/perl.vcxproj b/plugins/perl/perl.vcxproj
index 1a76928d..7ae6da0b 100644
--- a/plugins/perl/perl.vcxproj
+++ b/plugins/perl/perl.vcxproj
@@ -62,7 +62,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PERL520_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(PerlPath)\lib\CORE;$(IntDir);..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..;$(PerlPath)\lib\CORE;$(IntDir);..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
@@ -91,7 +91,7 @@ move hexchat.pm.h "$(IntDir)"</Command>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;PERL520_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(PerlPath)\lib\CORE;$(IntDir);..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..;$(PerlPath)\lib\CORE;$(IntDir);..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
diff --git a/plugins/python/python.c b/plugins/python/python.c
index d662557d..f0e4aa72 100644
--- a/plugins/python/python.c
+++ b/plugins/python/python.c
@@ -51,6 +51,8 @@
  *
  */
 
+#include "config.h"
+
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <string.h>
@@ -64,9 +66,9 @@
 #include <dirent.h>
 #endif
 
-#include "../../config.h"
 #include "hexchat-plugin.h"
-#undef _POSIX_C_SOURCE	/* Avoid warning: also in /usr/include/features.h from glib.h */
+#undef _POSIX_C_SOURCE	/* Avoid warnings from /usr/include/features.h */
+#undef _XOPEN_SOURCE
 #include <Python.h>
 #include <structmember.h>
 #include <pythread.h>
diff --git a/plugins/sysinfo/xsys.c b/plugins/sysinfo/xsys.c
index 17c25616..ba02ad46 100644
--- a/plugins/sysinfo/xsys.c
+++ b/plugins/sysinfo/xsys.c
@@ -22,6 +22,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
-- 
cgit 1.4.1