sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

code cleanup: quiet warnings building with mingw.

Browse Source
This commit is contained in:
Campbell Barton 2013-03-29 00:50:52 +00:00
parent 63290beee1
commit 10b4a86dbf
8 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
intern/guardedalloc/MEM_sys_types.h
View File

@ -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__ */

2
intern/opennl/superlu/superlu_sys_types.h
View File

@ -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

1
intern/utfconv/utf_winfunc.c
View File

@ -28,6 +28,7 @@
#endif
#include "utf_winfunc.h"
#include "utfconv.h"
#include <io.h>
#include <windows.h>
#include <wchar.h>

1
intern/utfconv/utf_winfunc.h
View File

@ -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);

2
intern/utfconv/utfconv.h
View File

@ -27,8 +27,6 @@
#include <stdio.h>
#include <stdlib.h>
#ifdef __cplusplus
extern "C" {
#endif

6
source/blender/blenlib/intern/fileops.c
View File

@ -45,7 +45,7 @@
#ifdef __MINGW32__
#include <ctype.h>
#endif
#include <io.h>
# include <io.h>
# include "BLI_winstuff.h"
# include "BLI_callbacks.h"
# include "utf_winfunc.h"
@ -374,7 +374,7 @@ void BLI_dir_create_recursive(const char *dirname)
* blah1/blah2 (without slash) */
BLI_strncpy(tmp, dirname, sizeof(tmp));
lslash = BLI_last_slash(tmp);
lslash = (char *)BLI_last_slash(tmp);
if (lslash && (*(lslash + 1) == '\0')) {
*lslash = '\0';
@ -385,7 +385,7 @@ void BLI_dir_create_recursive(const char *dirname)
if (BLI_exists(tmp)) return;
lslash = BLI_last_slash(tmp);
lslash = (char *)BLI_last_slash(tmp);
if (lslash) {
/* Split about the last slash and recurse */

3
source/blender/blenlib/intern/path_util.c
View File

@ -61,7 +61,8 @@
#endif
#ifdef WIN32
#include "utf_winfunc.h"
# include "utf_winfunc.h"
# include "utfconv.h"
# include <io.h>
# ifdef _WIN32_IE
# undef _WIN32_IE

4
source/blender/blenloader/BLO_sys_types.h
View File

@ -100,10 +100,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