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

1 files changed, 1 insertions, 5 deletions

diff --git a/src/tools/db-convert.c b/src/tools/db-convert.c
index 38c2e675d..d561c5333 100644
--- a/src/tools/db-convert.c
+++ b/src/tools/db-convert.c
@@ -25,10 +25,10 @@
 #ifndef _WIN32
 #include <unistd.h>
 #else
-#include "sysconf.h"
 #include <windows.h>
 #include <io.h>
 #endif
+#include "sysconf.h"
 
 #include <string>
 #include <iostream>
@@ -63,10 +63,6 @@
 	} \
 } while (0)
 
-typedef int16_t int16;
-typedef u_int16_t uint16;
-typedef int32_t int32;
-typedef u_int32_t uint32;
 typedef struct memo_ Memo;
 typedef struct dbFILE_ dbFILE;
 typedef struct nickalias_ NickAlias;