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 #include #include 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 #include #include 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 #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 #include #include 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 #include #include 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 @@ true true WIN32;NDEBUG;_WINDOWS;_USRDLL;PERL520_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions) - $(PerlPath)\lib\CORE;$(IntDir);..\..\src\common;%(AdditionalIncludeDirectories) + $(SolutionDir)..;$(PerlPath)\lib\CORE;$(IntDir);..\..\src\common;%(AdditionalIncludeDirectories) true @@ -91,7 +91,7 @@ move hexchat.pm.h "$(IntDir)" true true WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;PERL520_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions) - $(PerlPath)\lib\CORE;$(IntDir);..\..\src\common;%(AdditionalIncludeDirectories) + $(SolutionDir)..;$(PerlPath)\lib\CORE;$(IntDir);..\..\src\common;%(AdditionalIncludeDirectories) true 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 #include #include @@ -64,9 +66,9 @@ #include #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 #include #include 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 #include diff --git a/src/common/dbus/dbus-client.c b/src/common/dbus/dbus-client.c index e507883d..dd2d5ebe 100644 --- a/src/common/dbus/dbus-client.c +++ b/src/common/dbus/dbus-client.c @@ -19,6 +19,8 @@ * xclaesse@gmail.com */ +#include "config.h" + #define GLIB_DISABLE_DEPRECATION_WARNINGS #include #include "dbus-client.h" diff --git a/src/common/dcc.c b/src/common/dcc.c index a918aaca..2f246249 100644 --- a/src/common/dcc.c +++ b/src/common/dcc.c @@ -46,8 +46,6 @@ #include #endif -#include - #include "hexchat.h" #include "util.h" #include "fe.h" diff --git a/src/common/hexchat.h b/src/common/hexchat.h index 27df0b6f..ef05b4f4 100644 --- a/src/common/hexchat.h +++ b/src/common/hexchat.h @@ -22,6 +22,7 @@ #include #include #include +#include #include /* need time_t */ diff --git a/src/common/inbound.c b/src/common/inbound.c index f7232ce4..dbb29b57 100644 --- a/src/common/inbound.c +++ b/src/common/inbound.c @@ -33,8 +33,6 @@ #define WANTDNS #include "inet.h" -#include - #include "hexchat.h" #include "util.h" #include "ignore.h" diff --git a/src/common/inet.h b/src/common/inet.h index 990415be..aa57d0e4 100644 --- a/src/common/inet.h +++ b/src/common/inet.h @@ -47,7 +47,7 @@ #else -#include "../../config.h" +#include "config.h" #ifdef USE_IPV6 #include #include diff --git a/src/common/network.c b/src/common/network.c index 8790f673..d726bd24 100644 --- a/src/common/network.c +++ b/src/common/network.c @@ -18,6 +18,8 @@ /* ipv4 and ipv6 networking functions with a common interface */ +#include "config.h" + #include #include #include @@ -26,7 +28,6 @@ #ifndef WIN32 #include #endif -#include "../../config.h" #define WANTSOCKET #define WANTARPA diff --git a/src/common/plugin-timer.c b/src/common/plugin-timer.c index 511e0dd6..4f2030e3 100644 --- a/src/common/plugin-timer.c +++ b/src/common/plugin-timer.c @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" + #include #include #include diff --git a/src/common/ssl.c b/src/common/ssl.c index 21b30da3..26fbc1ba 100644 --- a/src/common/ssl.c +++ b/src/common/ssl.c @@ -29,7 +29,7 @@ #ifdef WIN32 #include /* RAND_seed() */ #endif -#include "../../config.h" +#include "config.h" #include /* asctime() */ #include /* strncpy() */ #include "ssl.h" /* struct cert_info */ diff --git a/src/common/util.c b/src/common/util.c index ffaa61a2..7eb6746f 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -40,7 +40,7 @@ #include #endif -#include "../../config.h" +#include "config.h" #include #include #include "hexchat.h" diff --git a/src/fe-gtk/fe-gtk.h b/src/fe-gtk/fe-gtk.h index 4801a56e..d3e1885b 100644 --- a/src/fe-gtk/fe-gtk.h +++ b/src/fe-gtk/fe-gtk.h @@ -20,7 +20,7 @@ #ifndef HEXCHAT_FE_GTK_H #define HEXCHAT_FE_GTK_H -#include "../../config.h" +#include "config.h" #define DISPLAY_NAME "HexChat" diff --git a/src/fe-gtk/sexy-iso-codes.c b/src/fe-gtk/sexy-iso-codes.c index e6acb726..06c8cd07 100644 --- a/src/fe-gtk/sexy-iso-codes.c +++ b/src/fe-gtk/sexy-iso-codes.c @@ -19,10 +19,11 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" + #include "sexy-iso-codes.h" #include #include -#include "../../config.h" #define ISO_639_DOMAIN "iso_639" #define ISO_3166_DOMAIN "iso_3166" diff --git a/src/fe-gtk/xtext.c b/src/fe-gtk/xtext.c index f7ddbde2..b2fadba0 100644 --- a/src/fe-gtk/xtext.c +++ b/src/fe-gtk/xtext.c @@ -31,7 +31,7 @@ #include #include -#include "../../config.h" +#include "config.h" #include "../common/hexchat.h" #include "../common/fe.h" #include "../common/util.h" diff --git a/win32/hexchat.props b/win32/hexchat.props index 2e906578..1d0f5845 100644 --- a/win32/hexchat.props +++ b/win32/hexchat.props @@ -111,6 +111,7 @@ xcopy /q /s /i "$(DepsRoot)\share\locale" "$(HexChatRel)\share\locale" MaxSpeed + $(SolutionDir)..;%(AdditionalIncludeDirectories)