diff options
Diffstat (limited to 'intern')
-rw-r--r-- | intern/guardedalloc/MEM_sys_types.h | 5 | ||||
-rw-r--r-- | intern/opennl/superlu/superlu_sys_types.h | 2 | ||||
-rw-r--r-- | intern/utfconv/utf_winfunc.c | 1 | ||||
-rw-r--r-- | intern/utfconv/utf_winfunc.h | 1 | ||||
-rw-r--r-- | intern/utfconv/utfconv.h | 2 |
5 files changed, 1 insertions, 10 deletions
diff --git a/intern/guardedalloc/MEM_sys_types.h b/intern/guardedalloc/MEM_sys_types.h index 3d43733c569..72563fc988d 100644 --- a/intern/guardedalloc/MEM_sys_types.h +++ b/intern/guardedalloc/MEM_sys_types.h @@ -108,10 +108,6 @@ typedef uint64_t u_int64_t; #include <inttypes.h> #elif defined(FREE_WINDOWS) -#ifndef FREE_WINDOWS64 -/* define htoln here, there must be a syntax error in winsock2.h in MinGW */ -unsigned long __attribute__((__stdcall__)) htonl(unsigned long); -#endif #include <stdint.h> #else @@ -144,4 +140,3 @@ unsigned long __attribute__((__stdcall__)) htonl(unsigned long); #endif #endif /* __MEM_SYS_TYPES_H__ */ - diff --git a/intern/opennl/superlu/superlu_sys_types.h b/intern/opennl/superlu/superlu_sys_types.h index 80d3da4d243..5685b34f1f4 100644 --- a/intern/opennl/superlu/superlu_sys_types.h +++ b/intern/opennl/superlu/superlu_sys_types.h @@ -98,8 +98,6 @@ typedef unsigned long uintptr_t; #include <inttypes.h> #elif defined(FREE_WINDOWS) -/* define htoln here, there must be a syntax error in winsock2.h in MinGW */ -unsigned long __attribute__((__stdcall__)) htonl(unsigned long); #include <stdint.h> #else diff --git a/intern/utfconv/utf_winfunc.c b/intern/utfconv/utf_winfunc.c index 3d7fb11309a..9f3e96b47fe 100644 --- a/intern/utfconv/utf_winfunc.c +++ b/intern/utfconv/utf_winfunc.c @@ -28,6 +28,7 @@ #endif #include "utf_winfunc.h" +#include "utfconv.h" #include <io.h> #include <windows.h> #include <wchar.h> diff --git a/intern/utfconv/utf_winfunc.h b/intern/utfconv/utf_winfunc.h index 45f6844af5a..e23a5dd5797 100644 --- a/intern/utfconv/utf_winfunc.h +++ b/intern/utfconv/utf_winfunc.h @@ -27,7 +27,6 @@ # error "This file can only compile on windows" #endif -#include "utfconv.h" #include <stdio.h> FILE * ufopen(const char * filename, const char * mode); diff --git a/intern/utfconv/utfconv.h b/intern/utfconv/utfconv.h index ada85e274e3..22710bfdb37 100644 --- a/intern/utfconv/utfconv.h +++ b/intern/utfconv/utfconv.h @@ -27,8 +27,6 @@ #include <stdio.h> #include <stdlib.h> - - #ifdef __cplusplus extern "C" { #endif |