Only compile the winsock stubs file on Win32

diff --git a/src/Makefile.am b/src/Makefile.am
index 799458a288eb725c636a1620cf88d33532bc9a70..c866633e260661711cfe2969935b990ec13a9534 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -236,6 +236,7 @@ SOURCES_libvlc_darwin = \
 
 SOURCES_libvlc_win32 = \
        misc/win32_specific.c \
+       network/winsock.c \
        $(NULL)
 
 SOURCES_libvlc_dirent = \
@@ -304,7 +305,6 @@ SOURCES_libvlc_common = \
        network/acl.c \
        network/getaddrinfo.c \
        network/io.c \
-       network/error.c \
        network/tcp.c \
        network/udp.c \
        network/httpd.c \

diff --git a/src/network/error.c b/src/network/winsock.c
similarity index 95%
rename from src/network/error.c
rename to src/network/winsock.c
index 71b423f1dd36b0ff69798f0c33df960036eafc54..e3b66eabb42472b9509264f39b150bc5f481b541 100644 (file)
--- a/src/network/error.c
+++ b/src/network/winsock.c
@@ -1,10 +1,7 @@
 /*****************************************************************************
- * error.c: Network error handling
+ * winsock.c: POSIX replacements for Winsock
  *****************************************************************************
- * Copyright (C) 2006 Rémi Denis-Courmont
- * $Id$
- *
- * Author : Rémi Denis-Courmont <rem # videolan.org>
+ * Copyright © 2006-2008 Rémi Denis-Courmont
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,9 +18,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-/*****************************************************************************
- * Preamble
- *****************************************************************************/
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
@@ -32,7 +26,6 @@
 #include <errno.h>
 #include <vlc_network.h>
 
-#if defined (WIN32) || defined (UNDER_CE)
 typedef struct
 {
     int code;
@@ -154,4 +147,3 @@ const char *net_strerror( int value )
     /* Remember to update src/misc/messages.c if you change this one */
     return "Unknown network stack error";
 }
-#endif