[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45645] trunk/blender/source: code cleanup : dont include BLI_winstuff.h on non windows systems, also cleanup some defines/includes for windows.
Campbell Barton
ideasman42 at gmail.com
Sun Apr 15 09:54:07 CEST 2012
Revision: 45645
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45645
Author: campbellbarton
Date: 2012-04-15 07:54:07 +0000 (Sun, 15 Apr 2012)
Log Message:
-----------
code cleanup: dont include BLI_winstuff.h on non windows systems, also cleanup some defines/includes for windows.
Modified Paths:
--------------
trunk/blender/source/blender/avi/intern/avi.c
trunk/blender/source/blender/avi/intern/options.c
trunk/blender/source/blender/blenkernel/intern/depsgraph.c
trunk/blender/source/blender/blenkernel/intern/screen.c
trunk/blender/source/blender/blenkernel/intern/unit.c
trunk/blender/source/blender/blenlib/BLI_winstuff.h
trunk/blender/source/blender/blenlib/intern/fileops.c
trunk/blender/source/blender/blenlib/intern/storage.c
trunk/blender/source/blender/blenloader/intern/readblenentry.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/blenloader/intern/runtime.c
trunk/blender/source/blender/blenloader/intern/writefile.c
trunk/blender/source/blender/editors/interface/interface_icons.c
trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
trunk/blender/source/blender/editors/space_console/space_console.c
trunk/blender/source/blender/editors/space_file/file_draw.c
trunk/blender/source/blender/editors/space_file/file_ops.c
trunk/blender/source/blender/editors/space_file/filelist.c
trunk/blender/source/blender/editors/space_file/filesel.c
trunk/blender/source/blender/editors/space_file/fsmenu.c
trunk/blender/source/blender/editors/space_text/text_header.c
trunk/blender/source/blender/gpu/intern/gpu_extensions.c
trunk/blender/source/blender/imbuf/intern/thumbs.c
trunk/blender/source/blender/windowmanager/intern/wm_files.c
trunk/blender/source/creator/creator.c
Modified: trunk/blender/source/blender/avi/intern/avi.c
===================================================================
--- trunk/blender/source/blender/avi/intern/avi.c 2012-04-15 07:32:56 UTC (rev 45644)
+++ trunk/blender/source/blender/avi/intern/avi.c 2012-04-15 07:54:07 UTC (rev 45645)
@@ -43,7 +43,9 @@
#include "MEM_guardedalloc.h"
#include "MEM_sys_types.h"
-#include "BLI_winstuff.h"
+#ifdef WIN32
+# include "BLI_winstuff.h"
+#endif
#include "AVI_avi.h"
#include "avi_intern.h"
Modified: trunk/blender/source/blender/avi/intern/options.c
===================================================================
--- trunk/blender/source/blender/avi/intern/options.c 2012-04-15 07:32:56 UTC (rev 45644)
+++ trunk/blender/source/blender/avi/intern/options.c 2012-04-15 07:54:07 UTC (rev 45645)
@@ -34,12 +34,13 @@
* \ingroup avi
*/
-
#include "AVI_avi.h"
#include "avi_intern.h"
#include "endian.h"
-#include "BLI_winstuff.h"
+#ifdef WIN32
+# include "BLI_winstuff.h"
+#endif
/* avi_set_compress_options gets its own file... now don't WE feel important? */
Modified: trunk/blender/source/blender/blenkernel/intern/depsgraph.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/depsgraph.c 2012-04-15 07:32:56 UTC (rev 45644)
+++ trunk/blender/source/blender/blenkernel/intern/depsgraph.c 2012-04-15 07:54:07 UTC (rev 45645)
@@ -34,7 +34,10 @@
#include "MEM_guardedalloc.h"
-#include "BLI_winstuff.h"
+#ifdef WIN32
+# include "BLI_winstuff.h"
+#endif
+
#include "BLI_utildefines.h"
#include "BLI_listbase.h"
#include "BLI_ghash.h"
Modified: trunk/blender/source/blender/blenkernel/intern/screen.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/screen.c 2012-04-15 07:32:56 UTC (rev 45644)
+++ trunk/blender/source/blender/blenkernel/intern/screen.c 2012-04-15 07:54:07 UTC (rev 45645)
@@ -30,7 +30,9 @@
* \ingroup bke
*/
-#include "BLI_winstuff.h"
+#ifdef WIN32
+# include "BLI_winstuff.h"
+#endif
#include <string.h>
#include <stdio.h>
Modified: trunk/blender/source/blender/blenkernel/intern/unit.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/unit.c 2012-04-15 07:32:56 UTC (rev 45644)
+++ trunk/blender/source/blender/blenkernel/intern/unit.c 2012-04-15 07:54:07 UTC (rev 45645)
@@ -34,8 +34,11 @@
#include "BLI_math.h"
#include "BLI_string.h"
#include "BLI_string_utf8.h"
-#include "BLI_winstuff.h"
+#ifdef WIN32
+# include "BLI_winstuff.h"
+#endif
+
#define TEMP_STR_SIZE 256
#define SEP_CHR '#'
Modified: trunk/blender/source/blender/blenlib/BLI_winstuff.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_winstuff.h 2012-04-15 07:32:56 UTC (rev 45644)
+++ trunk/blender/source/blender/blenlib/BLI_winstuff.h 2012-04-15 07:54:07 UTC (rev 45645)
@@ -33,28 +33,30 @@
* \brief Compatibility-like things for windows.
*/
-#ifdef _WIN32
+#ifndef _WIN32
+# error "This include is for Windows only!"
+#endif
#ifndef FREE_WINDOWS
-#pragma warning(once: 4761 4305 4244 4018)
+# pragma warning(once: 4761 4305 4244 4018)
#else
-#ifdef WINVER
-#undef WINVER
-#endif
+# ifdef WINVER
+# undef WINVER
+# endif
/* Some stuff requires WINVER 0x500, but mingw's default is 0x400 */
-#define WINVER 0x0501
+# define WINVER 0x0501
#endif
#define WIN32_LEAN_AND_MEAN
#ifndef WIN32_SKIP_HKEY_PROTECTION
-#undef HKEY
-#define HKEY WIN32_HKEY // prevent competing definitions
-#include <windows.h>
-#undef HKEY
+# undef HKEY
+# define HKEY WIN32_HKEY // prevent competing definitions
+# include <windows.h>
+# undef HKEY
#else
-#include <windows.h>
+# include <windows.h>
#endif
#undef near
@@ -83,10 +85,10 @@
#define MAXPATHLEN MAX_PATH
#ifndef S_ISREG
-#define S_ISREG(x) (((x)&_S_IFREG) == _S_IFREG)
+# define S_ISREG(x) (((x)&_S_IFREG) == _S_IFREG)
#endif
#ifndef S_ISDIR
-#define S_ISDIR(x) (((x)&_S_IFDIR) == _S_IFDIR)
+# define S_ISDIR(x) (((x)&_S_IFDIR) == _S_IFDIR)
#endif
/* defines for using ISO C++ conformant names */
@@ -98,22 +100,22 @@
/* use functions that take a 64 bit offset for files larger than 4GB */
#ifndef FREE_WINDOWS
-#include <stdio.h>
-#define fseek(stream, offset, origin) _fseeki64(stream, offset, origin)
-#define ftell(stream) _ftelli64(stream)
-#define lseek(fd, offset, origin) _lseeki64(fd, offset, origin)
-#define tell(fd) _telli64(fd)
+# include <stdio.h>
+# define fseek(stream, offset, origin) _fseeki64(stream, offset, origin)
+# define ftell(stream) _ftelli64(stream)
+# define lseek(fd, offset, origin) _lseeki64(fd, offset, origin)
+# define tell(fd) _telli64(fd)
#endif
/* mingw using _SSIZE_T_ to declare ssize_t type */
#ifndef _SSIZE_T_
-#define _SSIZE_T_
+# define _SSIZE_T_
/* python uses HAVE_SSIZE_T */
-#ifndef HAVE_SSIZE_T
-#define HAVE_SSIZE_T 1
+# ifndef HAVE_SSIZE_T
+# define HAVE_SSIZE_T 1
typedef long ssize_t;
+# endif
#endif
-#endif
struct dirent {
int d_ino;
@@ -148,7 +150,5 @@
}
#endif
-#endif /* _WIN32 */
-
#endif /* __BLI_WINSTUFF_H__ */
Modified: trunk/blender/source/blender/blenlib/intern/fileops.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/fileops.c 2012-04-15 07:32:56 UTC (rev 45644)
+++ trunk/blender/source/blender/blenlib/intern/fileops.c 2012-04-15 07:54:07 UTC (rev 45645)
@@ -43,16 +43,16 @@
#ifdef WIN32
#include <io.h>
-#include "BLI_winstuff.h"
-#include "BLI_callbacks.h"
-#include "utf_winfunc.h"
-#include "utfconv.h"
+# include "BLI_winstuff.h"
+# include "BLI_callbacks.h"
+# include "utf_winfunc.h"
+# include "utfconv.h"
#else
-#include <unistd.h> // for read close
-#include <sys/param.h>
-#include <dirent.h>
-#include <unistd.h>
-#include <sys/stat.h>
+# include <unistd.h> // for read close
+# include <sys/param.h>
+# include <dirent.h>
+# include <unistd.h>
+# include <sys/stat.h>
#endif
#include "MEM_guardedalloc.h"
Modified: trunk/blender/source/blender/blenlib/intern/storage.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/storage.c 2012-04-15 07:32:56 UTC (rev 45644)
+++ trunk/blender/source/blender/blenlib/intern/storage.c 2012-04-15 07:54:07 UTC (rev 45645)
@@ -68,20 +68,17 @@
#include <fcntl.h>
#include <string.h> /* strcpy etc.. */
-#ifndef WIN32
-#include <sys/ioctl.h>
-#include <unistd.h> /* */
-#include <pwd.h>
-#endif
-
#ifdef WIN32
-#include <io.h>
-#include <direct.h>
-#include "BLI_winstuff.h"
-#include "utfconv.h"
+# include <io.h>
+# include <direct.h>
+# include "BLI_winstuff.h"
+# include "utfconv.h"
+#else
+# include <sys/ioctl.h>
+# include <unistd.h>
+# include <pwd.h>
#endif
-
/* lib includes */
#include "MEM_guardedalloc.h"
Modified: trunk/blender/source/blender/blenloader/intern/readblenentry.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readblenentry.c 2012-04-15 07:32:56 UTC (rev 45644)
+++ trunk/blender/source/blender/blenloader/intern/readblenentry.c 2012-04-15 07:54:07 UTC (rev 45645)
@@ -64,8 +64,8 @@
#include "BLO_sys_types.h" // needed for intptr_t
-#ifdef _WIN32
-#include "BLI_winstuff.h"
+#ifdef WIN32
+# include "BLI_winstuff.h"
#endif
/* local prototypes --------------------- */
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2012-04-15 07:32:56 UTC (rev 45644)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2012-04-15 07:54:07 UTC (rev 45645)
@@ -42,11 +42,11 @@
#include <stdarg.h> /* for va_start/end */
#ifndef WIN32
- #include <unistd.h> // for read close
+# include <unistd.h> // for read close
#else
- #include <io.h> // for open close read
-#include "winsock2.h"
-#include "BLI_winstuff.h"
+# include <io.h> // for open close read
+# include "winsock2.h"
+# include "BLI_winstuff.h"
#endif
/* allow readfile to use deprecated functionality */
Modified: trunk/blender/source/blender/blenloader/intern/runtime.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/runtime.c 2012-04-15 07:32:56 UTC (rev 45644)
+++ trunk/blender/source/blender/blenloader/intern/runtime.c 2012-04-15 07:54:07 UTC (rev 45645)
@@ -39,10 +39,10 @@
#include <errno.h>
#ifdef WIN32
-#include <io.h> // read, open
-#include "BLI_winstuff.h"
+# include <io.h> // read, open
+# include "BLI_winstuff.h"
#else // ! WIN32
-#include <unistd.h> // read
+# include <unistd.h> // read
#endif
#include "BLO_readfile.h"
Modified: trunk/blender/source/blender/blenloader/intern/writefile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/writefile.c 2012-04-15 07:32:56 UTC (rev 45644)
+++ trunk/blender/source/blender/blenloader/intern/writefile.c 2012-04-15 07:54:07 UTC (rev 45645)
@@ -81,12 +81,12 @@
#include "zlib.h"
#ifndef WIN32
-#include <unistd.h>
+# include <unistd.h>
#else
-#include "winsock2.h"
-#include <io.h>
-#include <process.h> // for getpid
-#include "BLI_winstuff.h"
+# include "winsock2.h"
+# include <io.h>
+# include <process.h> // for getpid
+# include "BLI_winstuff.h"
#endif
/* allow writefile to use deprecated functionality (for forward compatibility code) */
Modified: trunk/blender/source/blender/editors/interface/interface_icons.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_icons.c 2012-04-15 07:32:56 UTC (rev 45644)
+++ trunk/blender/source/blender/editors/interface/interface_icons.c 2012-04-15 07:54:07 UTC (rev 45645)
@@ -33,12 +33,13 @@
#include <string.h>
#ifndef WIN32
-#include <unistd.h>
+# include <unistd.h>
#else
-#include <io.h>
-#include <direct.h>
-#include "BLI_winstuff.h"
-#endif
+# include <io.h>
+# include <direct.h>
+# include "BLI_winstuff.h"
+#endif
+
#include "MEM_guardedalloc.h"
#include "GPU_extensions.h"
Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_image.c 2012-04-15 07:32:56 UTC (rev 45644)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list