6 files changed, 18 insertions, 14 deletions
diff --git a/src/core/Makefile.win32 b/src/core/Makefile.win32
index e1f4301a3..a8329646f 100644
--- a/src/core/Makefile.win32
+++ b/src/core/Makefile.win32
@@ -4,7 +4,7 @@ SRCS=bs_act.c bs_assign.c bs_badwords.c bs_bot.c bs_botlist.c bs_fantasy.c bs_fa
      os_logonnews.c os_mode.c os_modinfo.c os_modlist.c os_modload.c os_modunload.c os_noop.c os_oline.c os_oper.c os_opernews.c os_quit.c os_randomnews.c os_raw.c os_reload.c os_restart.c os_session.c os_set.c os_sgline.c os_shutdown.c os_sqline.c os_staff.c os_stats.c os_svsnick.c os_szline.c os_umode.c os_update.c os_userlist.c
 OBJECTS= $(SRCS:.c=.dll)
 CFLAGS=/LD /MD /D MODULE_COMPILE $(CFLAGS) /I"../../include"
-LFLAGS=/link ../anope.lib wsock32.lib $(LIBS) $(LFLAGS) $(MYSQL_LIB_PATH) /export:AnopeInit /export:AnopeFini
+LFLAGS=/link ../anope.lib wsock32.lib $(LIBS) $(LFLAGS) $(MYSQL_LIB_PATH) /export:AnopeInit /export:AnopeFini /VERSION:$(VERSION)
 
 all: $(OBJECTS)
 
diff --git a/src/main.c b/src/main.c
index d68617aa1..b48e74797 100644
--- a/src/main.c
+++ b/src/main.c
@@ -476,7 +476,7 @@ int main(int ac, char **av, char **envp)
     else
         progname = av[0];
 
-#ifdef __CYGWIN__
+#ifdef _WIN32
     if (strcmp(progname, "listnicks.exe") == 0)
 #else
     if (strcmp(progname, "listnicks") == 0)
@@ -485,7 +485,7 @@ int main(int ac, char **av, char **envp)
         do_listnicks(ac, av);
         return 0;
     }
-#ifdef __CYGWIN__
+#ifdef _WIN32
     else if (strcmp(progname, "listchans.exe") == 0)
 #else
     else if (strcmp(progname, "listchans") == 0)
diff --git a/src/makefile.win32 b/src/makefile.win32
index 21a78661b..f8d87effd 100644
--- a/src/makefile.win32
+++ b/src/makefile.win32
@@ -22,13 +22,13 @@ OBJS =  actions.obj base64.obj botserv.obj channels.obj chanserv.obj commands.ob
         init.obj ircd.obj language.obj list.obj log.obj mail.obj main.obj memory.obj \
         memoserv.obj messages.obj misc.obj modules.obj news.obj nickserv.obj operserv.obj \
         process.obj send.obj servers.obj sessions.obj slist.obj sockutil.obj \
-        timeout.obj users.obj $(RDB_O) $(MYSQL_O)
+        timeout.obj userban.obj users.obj $(RDB_O) $(MYSQL_O)
         
 SRCS =  actions.c base64.c botserv.c channels.c chanserv.c commands.c compat.c \
         config.c datafiles.c encrypt.c events.c helpserv.c hostserv.c init.c ircd.c \
         language.c list.c log.c mail.c main.c memory.c memoserv.c messages.c misc.c \
         modules.c news.c nickserv.c operserv.c process.c send.c servers.obj sessions.c \
-        slist.c sockutil.c timeout.c users.c $(RDB_C) $(MYSQL_C) 
+        slist.c sockutil.c timeout.c userban.c users.c $(RDB_C) $(MYSQL_C) 
 
 ###########################################################################
         
diff --git a/src/protocol/Makefile.win32 b/src/protocol/Makefile.win32
index 1f46f7534..f9fe5772c 100644
--- a/src/protocol/Makefile.win32
+++ b/src/protocol/Makefile.win32
@@ -5,7 +5,7 @@ SRCS=bahamut.c dreamforge.c hybrid.c inspircd.c plexus.c ptlink.c rageircd.c rat
 
 OBJECTS= $(SRCS:.c=.dll)
 CFLAGS=/LD /MD /D MODULE_COMPILE $(CFLAGS) /I"../../include"
-LFLAGS=/link ../anope.lib wsock32.lib $(LIBS) $(LFLAGS) $(MYSQL_LIB_PATH) /export:AnopeInit
+LFLAGS=/link ../anope.lib wsock32.lib $(LIBS) $(LFLAGS) $(MYSQL_LIB_PATH) /export:AnopeInit /VERSION:$(VERSION)
 
 all: $(OBJECTS)
 
diff --git a/src/userban.c b/src/userban.c
index 1ef883516..87c8c1fc3 100644
--- a/src/userban.c
+++ b/src/userban.c
@@ -21,6 +21,8 @@
 
 /*************************************************************************/
 
+/* This 2 functions were originally found in Bahamut */
+
 /**
  * Turn a cidr value into a netmask
  * @param cidr CIDR value
@@ -467,6 +469,8 @@ BanInfo *banlist_lookup_id(BanList * bl, uint32 id)
                 return ban;
         }
     }
+
+    return NULL;
 }
 
 /* EOF */
diff --git a/src/win32.rc b/src/win32.rc
index 9a6c716a3..cb6c249ef 100644
--- a/src/win32.rc
+++ b/src/win32.rc
@@ -32,9 +32,9 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VER_ANOPE VERSIONINFO
- FILEVERSION 1,7,8,0
- PRODUCTVERSION 1,7,8,0
- FILEFLAGSMASK 0x17L
+ FILEVERSION 1,7,10,829
+ PRODUCTVERSION 1,7,10,829
+ FILEFLAGSMASK 0x17L10
 #ifdef _DEBUG
  FILEFLAGS 0x1L
 #else
@@ -48,14 +48,14 @@ BEGIN
     BEGIN
         BLOCK "040904b0"
         BEGIN
-            VALUE "CompanyName", "Anope Dev"
+            VALUE "CompanyName", "Anope Team"
             VALUE "FileDescription", "Anope IRC Services"
-            VALUE "FileVersion", "1.7.8"
+            VALUE "FileVersion", "1.7.10-dev"
             VALUE "InternalName", "Anope"
-            VALUE "LegalCopyright", "Copyright (C) 2005"
-            VALUE "OriginalFilename", "anoservices.exe"
+            VALUE "LegalCopyright", "Copyright (C) 2005 Anope Team"
+            VALUE "OriginalFilename", "anope.exe"
             VALUE "ProductName", "Anope"
-            VALUE "ProductVersion", "1.7.8"
+            VALUE "ProductVersion", "1.7.10.829"
         END
     END
     BLOCK "VarFileInfo"