[vlc-devel] commit: Only compile the winsock stubs file on Win32 ( Rémi Denis-Courmont )
git version control
git at videolan.org
Sat May 3 19:51:42 CEST 2008
vlc | branch: master | Rémi Denis-Courmont <rem at videolan.org> | Sat May 3 20:52:53 2008 +0300| [9ddd88e8d147e97b428ac5bef2c8177fd185911a]
Only compile the winsock stubs file on Win32
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9ddd88e8d147e97b428ac5bef2c8177fd185911a
---
src/Makefile.am | 2 +-
src/network/{error.c => winsock.c} | 12 ++----------
2 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 799458a..c866633 100644
--- 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 71b423f..e3b66ea 100644
--- 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
More information about the vlc-devel
mailing list