diff options
| -rw-r--r-- | src/common/cfgfiles.c | 1 | ||||
| -rw-r--r-- | src/common/ignore.c | 1 | ||||
| -rw-r--r-- | src/common/plugin.c | 1 | ||||
| -rw-r--r-- | src/common/text.c | 1 | ||||
| -rw-r--r-- | src/common/typedef.h | 14 | ||||
| -rw-r--r-- | src/fe-gtk/fkeys.c | 1 | ||||
| -rw-r--r-- | src/fe-gtk/gtkutil.c | 1 | ||||
| -rw-r--r-- | src/fe-gtk/palette.c | 1 | ||||
| -rw-r--r-- | src/fe-gtk/pixmaps.c | 2 | ||||
| -rw-r--r-- | win32/hexchat-xp.props | 5 | ||||
| -rw-r--r-- | win32/hexchat.props | 5 |
11 files changed, 28 insertions, 5 deletions
diff --git a/src/common/cfgfiles.c b/src/common/cfgfiles.c index 7e2cd653..168f116e 100644 --- a/src/common/cfgfiles.c +++ b/src/common/cfgfiles.c @@ -29,6 +29,7 @@ #include "fe.h" #include "text.h" #include "hexchatc.h" +#include "typedef.h" #ifdef WIN32 #include <io.h> diff --git a/src/common/ignore.c b/src/common/ignore.c index caeae06e..49b95c3b 100644 --- a/src/common/ignore.c +++ b/src/common/ignore.c @@ -36,6 +36,7 @@ #include "text.h" #include "util.h" #include "hexchatc.h" +#include "typedef.h" int ignored_ctcp = 0; /* keep a count of all we ignore */ diff --git a/src/common/plugin.c b/src/common/plugin.c index b918ff05..62b83ae1 100644 --- a/src/common/plugin.c +++ b/src/common/plugin.c @@ -44,6 +44,7 @@ typedef struct session hexchat_context; #include "hexchat-plugin.h" #include "plugin.h" +#include "typedef.h" #include "hexchatc.h" diff --git a/src/common/text.c b/src/common/text.c index 7e8da018..01c59704 100644 --- a/src/common/text.c +++ b/src/common/text.c @@ -43,6 +43,7 @@ #include "outbound.h" #include "hexchatc.h" #include "text.h" +#include "typedef.h" #ifdef WIN32 #include <windows.h> #endif diff --git a/src/common/typedef.h b/src/common/typedef.h index b20612ea..daeffcae 100644 --- a/src/common/typedef.h +++ b/src/common/typedef.h @@ -1,3 +1,8 @@ +#ifndef HEXCHAT_TYPEDEF_H +#define HEXCHAT_TYPEDEF_H + +#ifdef WIN32 + #ifndef SSIZE_T_DEFINED #ifdef ssize_t #undef ssize_t @@ -9,3 +14,12 @@ typedef _W64 int ssize_t; #endif #define SSIZE_T_DEFINED #endif + +#ifndef fstat +#define fstat _fstat +#define stat _stat +#endif + +#endif + +#endif diff --git a/src/fe-gtk/fkeys.c b/src/fe-gtk/fkeys.c index d47d694b..f86a59f8 100644 --- a/src/fe-gtk/fkeys.c +++ b/src/fe-gtk/fkeys.c @@ -55,6 +55,7 @@ #include "../common/util.h" #include "../common/text.h" #include "../common/plugin.h" +#include "../common/typedef.h" #include <gdk/gdkkeysyms.h> #include "gtkutil.h" #include "menu.h" diff --git a/src/fe-gtk/gtkutil.c b/src/fe-gtk/gtkutil.c index 46958cf9..4c34f41d 100644 --- a/src/fe-gtk/gtkutil.c +++ b/src/fe-gtk/gtkutil.c @@ -51,6 +51,7 @@ #include "../common/util.h" #include "../common/cfgfiles.h" #include "../common/hexchatc.h" +#include "../common/typedef.h" #include "gtkutil.h" #include "pixmaps.h" diff --git a/src/fe-gtk/palette.c b/src/fe-gtk/palette.c index 8866dda7..cd01c097 100644 --- a/src/fe-gtk/palette.c +++ b/src/fe-gtk/palette.c @@ -34,6 +34,7 @@ #include "../common/hexchat.h" #include "../common/util.h" #include "../common/cfgfiles.h" +#include "../common/typedef.h" GdkColor colors[] = { diff --git a/src/fe-gtk/pixmaps.c b/src/fe-gtk/pixmaps.c index b7fc40e2..49e0d56c 100644 --- a/src/fe-gtk/pixmaps.c +++ b/src/fe-gtk/pixmaps.c @@ -60,7 +60,7 @@ pixmap_load_from_file_real (char *file) if (!img) return NULL; gdk_pixbuf_render_pixmap_and_mask (img, &pixmap, NULL, 128); - gdk_pixbuf_unref (img); + g_object_unref (img); return pixmap; } diff --git a/win32/hexchat-xp.props b/win32/hexchat-xp.props index 3748fbf0..1d667b55 100644 --- a/win32/hexchat-xp.props +++ b/win32/hexchat-xp.props @@ -11,7 +11,8 @@ <YourPerl516Path>c:\mozilla-build\perl-5.16</YourPerl516Path> <YourPythonPath>c:\mozilla-build\python-2.7</YourPythonPath> <!-- YOU SHOULDN'T TOUCH ANYTHING BELOW --> - <OwnFlags>G_DISABLE_CAST_CHECKS;G_DISABLE_DEPRECATED;GDK_PIXBUF_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED;HAVE_STRTOULL;strtoull=_strtoui64;strcasecmp=stricmp;strncasecmp=strnicmp;__inline__=__inline;</OwnFlags> + <!-- G_DISABLE_DEPRECATED is unfeasible due to g_completion_* --> + <OwnFlags>G_DISABLE_CAST_CHECKS;GDK_PIXBUF_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED;HAVE_STRTOULL;strtoull=_strtoui64;strcasecmp=stricmp;strncasecmp=strnicmp;__inline__=__inline;</OwnFlags> <DepsRoot>$(YourDepsPath)\$(PlatformName)</DepsRoot> <GendefPath>$(YourGendefPath)</GendefPath> <LuaLib>lua51</LuaLib> @@ -111,7 +112,7 @@ copy "$(ProgramFiles)\Codejock Software\ISSkin\ISSkinU.dll" "$(HexChatRel)" <ItemDefinitionGroup> <ClCompile> - <WarningLevel>Level2</WarningLevel> + <WarningLevel>Level3</WarningLevel> </ClCompile> </ItemDefinitionGroup> diff --git a/win32/hexchat.props b/win32/hexchat.props index 1540d47a..733238f5 100644 --- a/win32/hexchat.props +++ b/win32/hexchat.props @@ -12,7 +12,8 @@ <YourPerl516Path>c:\mozilla-build\perl-5.16</YourPerl516Path> <YourPythonPath>c:\mozilla-build\python-2.7</YourPythonPath> <!-- YOU SHOULDN'T TOUCH ANYTHING BELOW --> - <OwnFlags>G_DISABLE_CAST_CHECKS;G_DISABLE_DEPRECATED;GDK_PIXBUF_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED;HAVE_STRTOULL;strtoull=_strtoui64;strcasecmp=stricmp;strncasecmp=strnicmp;__inline__=__inline;</OwnFlags> + <!-- G_DISABLE_DEPRECATED is unfeasible due to g_completion_* --> + <OwnFlags>G_DISABLE_CAST_CHECKS;GDK_PIXBUF_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED;HAVE_STRTOULL;strtoull=_strtoui64;strcasecmp=stricmp;strncasecmp=strnicmp;__inline__=__inline;</OwnFlags> <DepsRoot>$(YourDepsPath)\$(PlatformName)</DepsRoot> <GendefPath>$(YourGendefPath)</GendefPath> <MsgfmtPath>$(YourMsgfmtPath)</MsgfmtPath> @@ -124,7 +125,7 @@ copy "$(ProgramFiles)\Codejock Software\ISSkin\ISSkinU.dll" "$(HexChatRel)" <ItemDefinitionGroup> <ClCompile> - <WarningLevel>Level2</WarningLevel> + <WarningLevel>Level3</WarningLevel> </ClCompile> </ItemDefinitionGroup> |