fix FTBFS on windows due to previous change for freebsd/solaris.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@54526 e17a0e51-4ae3-4d35-97c3-1a29b211df97
This commit is contained in:
SND\weimingzhi_cp 2010-07-13 06:14:21 +00:00
parent b640cf7a0f
commit 2329ef0c46
2 changed files with 9 additions and 5 deletions

View File

@ -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.

View File

@ -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;