Skip to content

M
mpd
Commit 9652efd1 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

don't define WINVER in *.c files

In a C file, that is too late, because _mingw.h defaults to 0x0502, and ours would be illegal redefintion.
parent f3ea8343
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 13 deletions
src/main_win32.c
View file @ 9652efd1
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
#include <glib.h> #include <glib.h>
#define WINVER 0x0501
#include <windows.h> #include <windows.h>
static int service_argc; static int service_argc;
......
src/ntp_server.c
View file @ 9652efd1
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
#include <sys/time.h> #include <sys/time.h>
#ifdef WIN32 #ifdef WIN32
#define WINVER 0x0501
#include <ws2tcpip.h> #include <ws2tcpip.h>
#include <winsock.h> #include <winsock.h>
#else #else
......
src/resolver.c
View file @ 9652efd1
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
#include <sys/socket.h> #include <sys/socket.h>
#include <netdb.h> #include <netdb.h>
#else /* G_OS_WIN32 */ #else /* G_OS_WIN32 */
#define WINVER 0x0501
#include <ws2tcpip.h> #include <ws2tcpip.h>
#include <winsock.h> #include <winsock.h>
#endif /* G_OS_WIN32 */ #endif /* G_OS_WIN32 */
......
src/rtsp_client.c
View file @ 9652efd1
...@@ -36,7 +36,6 @@ ...@@ -36,7 +36,6 @@
#include <sys/time.h> #include <sys/time.h>
#ifdef WIN32 #ifdef WIN32
#define WINVER 0x0501
#include <ws2tcpip.h> #include <ws2tcpip.h>
#include <winsock.h> #include <winsock.h>
#else #else
......
src/rtsp_client.h
View file @ 9652efd1
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
#include <glib.h> #include <glib.h>
#ifdef WIN32 #ifdef WIN32
#define WINVER 0x0501
#include <ws2tcpip.h> #include <ws2tcpip.h>
#include <winsock.h> #include <winsock.h>
#else #else
......
src/server_socket.c
View file @ 9652efd1
...@@ -40,7 +40,6 @@ ...@@ -40,7 +40,6 @@
#include <assert.h> #include <assert.h>
#ifdef WIN32 #ifdef WIN32
#define WINVER 0x0501
#include <ws2tcpip.h> #include <ws2tcpip.h>
#include <winsock.h> #include <winsock.h>
#else #else
......
src/socket_util.c
View file @ 9652efd1
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
#ifndef G_OS_WIN32 #ifndef G_OS_WIN32
#include <sys/socket.h> #include <sys/socket.h>
#else /* G_OS_WIN32 */ #else /* G_OS_WIN32 */
#define WINVER 0x0501
#include <ws2tcpip.h> #include <ws2tcpip.h>
#include <winsock.h> #include <winsock.h>
#endif /* G_OS_WIN32 */ #endif /* G_OS_WIN32 */
......
src/tcp_connect.c
View file @ 9652efd1
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
#include <errno.h> #include <errno.h>
#ifdef WIN32 #ifdef WIN32
#define WINVER 0x0501
#include <ws2tcpip.h> #include <ws2tcpip.h>
#include <winsock.h> #include <winsock.h>
#else #else
......
src/tcp_socket.c
View file @ 9652efd1
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
#include <string.h> #include <string.h>
#ifdef WIN32 #ifdef WIN32
#define WINVER 0x0501
#include <ws2tcpip.h> #include <ws2tcpip.h>
#include <winsock.h> #include <winsock.h>
#else #else
......
src/udp_server.c
View file @ 9652efd1
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
#include <errno.h> #include <errno.h>
#ifdef WIN32 #ifdef WIN32
#define WINVER 0x0501
#include <ws2tcpip.h> #include <ws2tcpip.h>
#include <winsock.h> #include <winsock.h>
#else #else
......
test/run_ntp_server.c
View file @ 9652efd1
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
#include <unistd.h> #include <unistd.h>
#ifdef WIN32 #ifdef WIN32
#define WINVER 0x0501
#include <ws2tcpip.h> #include <ws2tcpip.h>
#include <winsock.h> #include <winsock.h>
#else #else
......
test/run_resolver.c
View file @ 9652efd1
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
#include "resolver.h" #include "resolver.h"
#ifdef WIN32 #ifdef WIN32
#define WINVER 0x0501
#include <ws2tcpip.h> #include <ws2tcpip.h>
#include <winsock.h> #include <winsock.h>
#else #else
......
test/run_tcp_connect.c
View file @ 9652efd1
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
#include <stdlib.h> #include <stdlib.h>
#ifdef WIN32 #ifdef WIN32
#define WINVER 0x0501
#include <ws2tcpip.h> #include <ws2tcpip.h>
#include <winsock.h> #include <winsock.h>
#else #else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment