diff options
| author | cyberbotx <cyberbotx@5417fbe8-f217-4b02-8779-1006273d7864> | 2008-12-17 20:16:55 +0000 |
|---|---|---|
| committer | cyberbotx <cyberbotx@5417fbe8-f217-4b02-8779-1006273d7864> | 2008-12-17 20:16:55 +0000 |
| commit | 2d72446860abac08dc4f36b10fde7536f7897956 (patch) | |
| tree | 25dc114bb696bc8752d68e6e050da8d3dda5f282 /include/services.h | |
| parent | 1cd73b4dadb8e618a0ec56289408922be42aac8a (diff) | |
More CMake work, mostly to handle both *nix and Windows builds.
Also some tweaks to generation files (like version.sh) to take both input and output files as arguments, to handle CMake when it's used for an out-of-source build.
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1836 5417fbe8-f217-4b02-8779-1006273d7864
Diffstat (limited to 'include/services.h')
| -rw-r--r-- | include/services.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/services.h b/include/services.h index 66e12aeb2..7d504e3a2 100644 --- a/include/services.h +++ b/include/services.h @@ -81,7 +81,7 @@ #include <sys/stat.h> /* for umask() on some systems */ #include <sys/types.h> -#ifndef _WIN32 +#ifdef HAVE_GETTIMEOFDAY #include <sys/time.h> #endif @@ -197,7 +197,8 @@ extern int strncasecmp(const char *, const char *, size_t); */ #ifdef _WIN32 #define MODULE_INIT(x, y) \ - extern "C" DllExport Module *init_module(const std::string &modname, const std::string &creator) \ + extern "C" DllExport Module *init_module(const std::string &, const std::string &); \ + extern "C" Module *init_module(const std::string &modname, const std::string &creator) \ { \ return new y(x, creator); \ } \ @@ -211,9 +212,10 @@ extern int strncasecmp(const char *, const char *, size_t); } \ return TRUE; \ } \ - extern "C" DllExport void destroy_module(y *m) \ + extern "C" DllExport void destroy_module(y *); \ + extern "C" void destroy_module(y *m) \ { \ - delete m; \ + delete m; \ } #else |