[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55658] trunk/blender: code cleanup: quiet warnings building with mingw.

[Campbell Barton]

Revision: 55658
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55658
Author:   campbellbarton
Date:     2013-03-29 00:50:52 +0000 (Fri, 29 Mar 2013)
Log Message:
-----------
code cleanup: quiet warnings building with mingw.

Modified Paths:
--------------
    trunk/blender/intern/guardedalloc/MEM_sys_types.h
    trunk/blender/intern/opennl/superlu/superlu_sys_types.h
    trunk/blender/intern/utfconv/utf_winfunc.c
    trunk/blender/intern/utfconv/utf_winfunc.h
    trunk/blender/intern/utfconv/utfconv.h
    trunk/blender/source/blender/blenlib/intern/fileops.c
    trunk/blender/source/blender/blenlib/intern/path_util.c
    trunk/blender/source/blender/blenloader/BLO_sys_types.h

Modified: trunk/blender/intern/guardedalloc/MEM_sys_types.h
===================================================================
--- trunk/blender/intern/guardedalloc/MEM_sys_types.h	2013-03-29 00:36:46 UTC (rev 55657)
+++ trunk/blender/intern/guardedalloc/MEM_sys_types.h	2013-03-29 00:50:52 UTC (rev 55658)
@@ -108,10 +108,6 @@
 #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 @@
 #endif
 
 #endif /* __MEM_SYS_TYPES_H__ */
-

Modified: trunk/blender/intern/opennl/superlu/superlu_sys_types.h
===================================================================
--- trunk/blender/intern/opennl/superlu/superlu_sys_types.h	2013-03-29 00:36:46 UTC (rev 55657)
+++ trunk/blender/intern/opennl/superlu/superlu_sys_types.h	2013-03-29 00:50:52 UTC (rev 55658)
@@ -98,8 +98,6 @@
 #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

Modified: trunk/blender/intern/utfconv/utf_winfunc.c
===================================================================
--- trunk/blender/intern/utfconv/utf_winfunc.c	2013-03-29 00:36:46 UTC (rev 55657)
+++ trunk/blender/intern/utfconv/utf_winfunc.c	2013-03-29 00:50:52 UTC (rev 55658)
@@ -28,6 +28,7 @@
 #endif
 
 #include "utf_winfunc.h"
+#include "utfconv.h"
 #include <io.h>
 #include <windows.h>
 #include <wchar.h>

Modified: trunk/blender/intern/utfconv/utf_winfunc.h
===================================================================
--- trunk/blender/intern/utfconv/utf_winfunc.h	2013-03-29 00:36:46 UTC (rev 55657)
+++ trunk/blender/intern/utfconv/utf_winfunc.h	2013-03-29 00:50:52 UTC (rev 55658)
@@ -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);

Modified: trunk/blender/intern/utfconv/utfconv.h
===================================================================
--- trunk/blender/intern/utfconv/utfconv.h	2013-03-29 00:36:46 UTC (rev 55657)
+++ trunk/blender/intern/utfconv/utfconv.h	2013-03-29 00:50:52 UTC (rev 55658)
@@ -27,8 +27,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-
-
 #ifdef __cplusplus 
 extern  "C" {
 #endif

Modified: trunk/blender/source/blender/blenlib/intern/fileops.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/fileops.c	2013-03-29 00:36:46 UTC (rev 55657)
+++ trunk/blender/source/blender/blenlib/intern/fileops.c	2013-03-29 00:50:52 UTC (rev 55658)
@@ -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 @@
 	 * 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 @@
 
 	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 */

Modified: trunk/blender/source/blender/blenlib/intern/path_util.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/path_util.c	2013-03-29 00:36:46 UTC (rev 55657)
+++ trunk/blender/source/blender/blenlib/intern/path_util.c	2013-03-29 00:50:52 UTC (rev 55658)
@@ -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

Modified: trunk/blender/source/blender/blenloader/BLO_sys_types.h
===================================================================
--- trunk/blender/source/blender/blenloader/BLO_sys_types.h	2013-03-29 00:36:46 UTC (rev 55657)
+++ trunk/blender/source/blender/blenloader/BLO_sys_types.h	2013-03-29 00:50:52 UTC (rev 55658)
@@ -100,10 +100,6 @@
 #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