Commit 0b1af34f authored by Philipp Schafft's avatar Philipp Schafft 🦁 Committed by Thomas B. Rücker

Prevent various redefined definitions in win32-specific code

From: Erik van Pienbroek <epienbro@fedoraproject.org>
Date: Mon, 22 Dec 2014 18:02:09 +0100
parent 0dbabcc4
...@@ -32,9 +32,6 @@ ...@@ -32,9 +32,6 @@
#include <netinet/in.h> #include <netinet/in.h>
#else #else
#include <winsock2.h> #include <winsock2.h>
#define snprintf _snprintf
#define strcasecmp stricmp
#define strncasecmp strnicmp
#endif #endif
#include "compat.h" #include "compat.h"
......
...@@ -47,12 +47,6 @@ ...@@ -47,12 +47,6 @@
#include "stats.h" #include "stats.h"
#define CATMODULE "format" #define CATMODULE "format"
#ifdef WIN32
#define strcasecmp stricmp
#define strncasecmp strnicmp
#define snprintf _snprintf
#endif
static int format_prepare_headers (source_t *source, client_t *client); static int format_prepare_headers (source_t *source, client_t *client);
......
...@@ -41,12 +41,6 @@ ...@@ -41,12 +41,6 @@
#include "format_mp3.h" #include "format_mp3.h"
#ifdef WIN32
#define strcasecmp stricmp
#define strncasecmp strnicmp
#define snprintf _snprintf
#endif
#define CATMODULE "format-mp3" #define CATMODULE "format-mp3"
/* Note that this seems to be 8192 in shoutcast - perhaps we want to be the /* Note that this seems to be 8192 in shoutcast - perhaps we want to be the
......
...@@ -35,11 +35,8 @@ ...@@ -35,11 +35,8 @@
#else #else
#include <winsock2.h> #include <winsock2.h>
#include <windows.h> #include <windows.h>
#define fseeko fseek
#define SCN_OFF_T "ld" #define SCN_OFF_T "ld"
#define PRI_OFF_T "ld" #define PRI_OFF_T "ld"
#define snprintf _snprintf
#define strncasecmp _strnicmp
#ifndef S_ISREG #ifndef S_ISREG
#define S_ISREG(mode) ((mode) & _S_IFREG) #define S_ISREG(mode) ((mode) & _S_IFREG)
#endif #endif
......
...@@ -21,8 +21,14 @@ ...@@ -21,8 +21,14 @@
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#ifdef HAVE_CURL
#include <curl/curl.h>
#endif
#ifdef WIN32 #ifdef WIN32
#ifndef _WIN32_WINNT
#define _WIN32_WINNT 0x0400 #define _WIN32_WINNT 0x0400
#endif
/* For getpid() */ /* For getpid() */
#include <process.h> #include <process.h>
#include <windows.h> #include <windows.h>
...@@ -33,9 +39,6 @@ ...@@ -33,9 +39,6 @@
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
# include <unistd.h> # include <unistd.h>
#endif #endif
#ifdef HAVE_CURL
#include <curl/curl.h>
#endif
#ifdef HAVE_UNAME #ifdef HAVE_UNAME
#include <sys/utsname.h> #include <sys/utsname.h>
......
...@@ -174,7 +174,7 @@ void MD5Final(unsigned char digest[HASH_LEN], struct MD5Context *ctx) ...@@ -174,7 +174,7 @@ void MD5Final(unsigned char digest[HASH_LEN], struct MD5Context *ctx)
MD5Transform(ctx->buf, (uint32_t *) ctx->in); MD5Transform(ctx->buf, (uint32_t *) ctx->in);
byteReverse((unsigned char *) ctx->buf, 4); byteReverse((unsigned char *) ctx->buf, 4);
memcpy(digest, ctx->buf, HASH_LEN); memcpy(digest, ctx->buf, HASH_LEN);
memset(ctx, 0, sizeof(ctx)); memset(ctx, 0, sizeof(*ctx));
/* In case it's sensitive */ /* In case it's sensitive */
} }
......
...@@ -32,9 +32,6 @@ ...@@ -32,9 +32,6 @@
#include <netinet/in.h> #include <netinet/in.h>
#else #else
#include <winsock2.h> #include <winsock2.h>
#define snprintf _snprintf
#define strcasecmp stricmp
#define strncasecmp strnicmp
#endif #endif
#include "compat.h" #include "compat.h"
......
...@@ -31,9 +31,6 @@ ...@@ -31,9 +31,6 @@
#include <winsock2.h> #include <winsock2.h>
#include <windows.h> #include <windows.h>
#include <stdio.h> #include <stdio.h>
#define snprintf _snprintf
#define strcasecmp stricmp
#define strncasecmp strnicmp
#endif #endif
#include "common/net/sock.h" #include "common/net/sock.h"
......
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