diff options
| -rw-r--r-- | include/config.h | 4 | ||||
| -rw-r--r-- | include/services.h | 22 | ||||
| -rw-r--r-- | include/sysconf.h.cmake | 3 |
3 files changed, 16 insertions, 13 deletions
diff --git a/include/config.h b/include/config.h index f386b1747..5cba79587 100644 --- a/include/config.h +++ b/include/config.h @@ -51,7 +51,7 @@ enum ConfigDataType * The callback function can then alter the values of the ValueItem * classes to validate the settings. */ -class ValueItem +class CoreExport ValueItem { private: /** Actual data */ @@ -290,7 +290,7 @@ class ConfigurationFile /** Holds all of the core configuration items */ -class ConfigItems +class CoreExport ConfigItems { public: /** Holds a core configuration item and its callbacks diff --git a/include/services.h b/include/services.h index 15896ca83..f5a787a24 100644 --- a/include/services.h +++ b/include/services.h @@ -43,6 +43,19 @@ #include <fcntl.h> #include <typeinfo> +#if GETTEXT_FOUND +# include <libintl.h> +# define _(x) anope_gettext(x) +# ifdef _WIN32 + /* Redefine snprintf and undefine vsnprintf because liblintl defines it to its own function */ +# undef snprintf +# define snprintf _snprintf +# undef vsnprintf +# endif +#else +# define _(x) x +#endif + #ifndef _WIN32 # include <unistd.h> # include <grp.h> @@ -140,13 +153,6 @@ extern "C" void __pfnBkCheck() {} # undef int32 #endif -#if GETTEXT_FOUND -# include <libintl.h> -# define _(x) anope_gettext(x) -#else -# define _(x) x -#endif - /** This definition is used as shorthand for the various classes * and functions needed to make a module loadable by the OS. * It defines the class factory and external AnopeInit and AnopeFini functions. @@ -508,7 +514,7 @@ const Anope::string MemoFlagStrings[] = { /* Memo info structures. Since both nicknames and channels can have memos, * we encapsulate memo data in a MemoList to make it easier to handle. */ -class Memo : public Flags<MemoFlag> +class CoreExport Memo : public Flags<MemoFlag> { public: Memo(); diff --git a/include/sysconf.h.cmake b/include/sysconf.h.cmake index 1509ab5d7..17aa98674 100644 --- a/include/sysconf.h.cmake +++ b/include/sysconf.h.cmake @@ -103,9 +103,6 @@ typedef unsigned long uint32; #endif #ifdef _WIN32 -# ifdef MSVCPP -# define snprintf _snprintf -# endif # define popen _popen # define pclose _pclose # define ftruncate _chsize |