summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgeniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b <geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>2006-06-13 17:01:37 +0000
committergeniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b <geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>2006-06-13 17:01:37 +0000
commit33a07509f5b3b238a549a0218248fd1cc53aba66 (patch)
tree236f494905089fae97702bff9dfd54020b91ec30
parentb95c53765cd3bdd85a60072f3f32d4ce4ad950bc (diff)
BUILD : 1.7.14 (1049) BUGS : NOTES : Two small win32 fixes...
git-svn-id: svn://svn.anope.org/anope/trunk@1049 31f1291d-b8d6-0310-a050-a5561fc1590b git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@773 5417fbe8-f217-4b02-8779-1006273d7864
-rw-r--r--include/version.sh.c3
-rw-r--r--src/protocol/inspircd.c2
-rw-r--r--version.log6
3 files changed, 9 insertions, 2 deletions
diff --git a/include/version.sh.c b/include/version.sh.c
index bf2bac91d..67e495d5e 100644
--- a/include/version.sh.c
+++ b/include/version.sh.c
@@ -219,5 +219,6 @@ void parse_line(FILE * fd, char *line)
} else
fputc(*c, fd);
}
- fprintf(fd, "\r\n");
+ /* We only need \n here - we didn't open the file as binary -GD */
+ fprintf(fd, "\n");
}
diff --git a/src/protocol/inspircd.c b/src/protocol/inspircd.c
index d3d4ac0b4..c3630a3b7 100644
--- a/src/protocol/inspircd.c
+++ b/src/protocol/inspircd.c
@@ -18,9 +18,11 @@
#include "pseudo.h"
#include "inspircd.h"
+#ifndef _WIN32
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
+#endif
#ifdef _WIN32
#include "winsock.h"
diff --git a/version.log b/version.log
index 5e36263e4..d38b047dc 100644
--- a/version.log
+++ b/version.log
@@ -9,10 +9,14 @@ VERSION_MAJOR="1"
VERSION_MINOR="7"
VERSION_PATCH="14"
VERSION_EXTRA=""
-VERSION_BUILD="1048"
+VERSION_BUILD="1049"
# $Log$
#
+# BUILD : 1.7.14 (1049)
+# BUGS :
+# NOTES : Two small win32 fixes...
+#
# BUILD : 1.7.14 (1048)
# BUGS : 510
# NOTES : Fixed a lot of redundant function declarations