summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--libpcsxcore/socket.c10
2 files changed, 9 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 7d87cd7b..c9539180 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+July 13, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
+
+ * libpcsxcore/socket.c: Fixed FTBFS on Windows.
+
July 12, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
* configure.ac: Use pkgconfig to detect libcdio.
diff --git a/libpcsxcore/socket.c b/libpcsxcore/socket.c
index 432deac5..2e0dc870 100644
--- a/libpcsxcore/socket.c
+++ b/libpcsxcore/socket.c
@@ -15,13 +15,14 @@
* along with this program; if not, see <http://www.gnu.org/licenses>.
*/
+#ifdef _WIN32
+#include <winsock2.h>
+#endif
+
#include "psxcommon.h"
#include "socket.h"
-#include <stdio.h>
-#ifdef _WIN32
-#include <winsock2.h>
-#else
+#ifndef _WIN32
#include <sys/socket.h>
#include <sys/ioctl.h>
#include <arpa/inet.h>
@@ -29,7 +30,6 @@
#include <unistd.h>
#include <fcntl.h>
#endif
-#include <stdlib.h>
static int server_socket = 0;
static int client_socket = 0;