[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23030] branches/blender2.5/blender: * cleaning up warnings (mostly windows).
Nathan Letwory
jesterking at letwory.net
Sun Sep 6 15:20:05 CEST 2009
Revision: 23030
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23030
Author: jesterking
Date: 2009-09-06 15:20:05 +0200 (Sun, 06 Sep 2009)
Log Message:
-----------
* cleaning up warnings (mostly windows). A collection of other warning fixes too (undefined function, assuming int, etc.)
This compiled fine with scons/msvc and scons/mingw (gcc 4.4.0). Please test and report any problems.
Modified Paths:
--------------
branches/blender2.5/blender/intern/iksolver/intern/TNT/tntmath.h
branches/blender2.5/blender/intern/smoke/intern/tnt/tnt_math_utils.h
branches/blender2.5/blender/intern/string/STR_String.h
branches/blender2.5/blender/source/blender/blenkernel/intern/image.c
branches/blender2.5/blender/source/blender/blenkernel/intern/packedFile.c
branches/blender2.5/blender/source/blender/blenkernel/intern/pointcache.c
branches/blender2.5/blender/source/blender/blenkernel/intern/sound.c
branches/blender2.5/blender/source/blender/blenlib/BLI_fileops.h
branches/blender2.5/blender/source/blender/blenlib/BLI_winstuff.h
branches/blender2.5/blender/source/blender/blenlib/intern/bpath.c
branches/blender2.5/blender/source/blender/blenlib/intern/fileops.c
branches/blender2.5/blender/source/blender/blenlib/intern/storage.c
branches/blender2.5/blender/source/blender/blenloader/intern/readblenentry.c
branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
branches/blender2.5/blender/source/blender/blenloader/intern/writefile.c
branches/blender2.5/blender/source/blender/editors/armature/editarmature_generate.c
branches/blender2.5/blender/source/blender/editors/interface/interface_icons.c
branches/blender2.5/blender/source/blender/editors/mesh/meshtools.c
branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_ops.c
branches/blender2.5/blender/source/blender/imbuf/intern/anim5.c
branches/blender2.5/blender/source/blender/imbuf/intern/hamx.c
branches/blender2.5/blender/source/blender/imbuf/intern/iff.c
branches/blender2.5/blender/source/blender/imbuf/intern/thumbs.c
branches/blender2.5/blender/source/blender/imbuf/intern/writeimage.c
branches/blender2.5/blender/source/blender/python/intern/bpy_interface.c
branches/blender2.5/blender/source/blender/readblenfile/intern/BLO_readblenfile.c
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c
branches/blender2.5/blender/source/gameengine/Converter/KX_ConvertProperties.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/blender2.5/blender/source/gameengine/VideoTexture/SConscript
Modified: branches/blender2.5/blender/intern/iksolver/intern/TNT/tntmath.h
===================================================================
--- branches/blender2.5/blender/intern/iksolver/intern/TNT/tntmath.h 2009-09-06 07:22:32 UTC (rev 23029)
+++ branches/blender2.5/blender/intern/iksolver/intern/TNT/tntmath.h 2009-09-06 13:20:05 UTC (rev 23030)
@@ -35,8 +35,10 @@
// conventional functions required by several matrix algorithms
+#ifdef _WIN32
+#define hypot _hypot
+#endif
-
namespace TNT
{
Modified: branches/blender2.5/blender/intern/smoke/intern/tnt/tnt_math_utils.h
===================================================================
--- branches/blender2.5/blender/intern/smoke/intern/tnt/tnt_math_utils.h 2009-09-06 07:22:32 UTC (rev 23029)
+++ branches/blender2.5/blender/intern/smoke/intern/tnt/tnt_math_utils.h 2009-09-06 13:20:05 UTC (rev 23030)
@@ -4,8 +4,10 @@
/* needed for fabs, sqrt() below */
#include <cmath>
+#ifdef _WIN32
+#define hypot _hypot
+#endif
-
namespace TNT
{
/**
Modified: branches/blender2.5/blender/intern/string/STR_String.h
===================================================================
--- branches/blender2.5/blender/intern/string/STR_String.h 2009-09-06 07:22:32 UTC (rev 23029)
+++ branches/blender2.5/blender/intern/string/STR_String.h 2009-09-06 13:20:05 UTC (rev 23030)
@@ -54,6 +54,10 @@
#include "MEM_guardedalloc.h"
#endif
+#ifdef _WIN32
+#define stricmp _stricmp
+#endif
+
class STR_String;
typedef unsigned long dword;
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/image.c 2009-09-06 07:22:32 UTC (rev 23029)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/image.c 2009-09-06 13:20:05 UTC (rev 23030)
@@ -38,6 +38,11 @@
#include <time.h>
+#ifdef _WIN32
+#define open _open
+#define close _close
+#endif
+
#include "MEM_guardedalloc.h"
#include "IMB_imbuf_types.h"
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/packedFile.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/packedFile.c 2009-09-06 07:22:32 UTC (rev 23029)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/packedFile.c 2009-09-06 13:20:05 UTC (rev 23030)
@@ -63,6 +63,14 @@
#include "BKE_packedFile.h"
#include "BKE_report.h"
+#ifdef _WIN32
+#define open _open
+#define close _close
+#define read _read
+#define write _write
+#endif
+
+
int seekPackedFile(PackedFile *pf, int offset, int whence)
{
int oldseek = -1, seek = 0;
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/pointcache.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/pointcache.c 2009-09-06 07:22:32 UTC (rev 23029)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/pointcache.c 2009-09-06 13:20:05 UTC (rev 23030)
@@ -67,25 +67,15 @@
/* needed for directory lookup */
+/* untitled blend's need getpid for a unique name */
#ifndef WIN32
#include <dirent.h>
+#include <unistd.h>
#else
+#include <process.h>
#include "BLI_winstuff.h"
#endif
-/* untitled blend's need getpid for a unique name */
-#ifdef WIN32
-#include <process.h>
-#else
-#include <unistd.h>
-#endif
-
-#ifdef _WIN32
-#ifndef snprintf
-#define snprintf _snprintf
-#endif
-#endif
-
static void ptcache_data_to(void **data, int type, int index, void *to);
static void ptcache_data_from(void **data, int type, void *from);
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/sound.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/sound.c 2009-09-06 07:22:32 UTC (rev 23029)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/sound.c 2009-09-06 13:20:05 UTC (rev 23030)
@@ -250,12 +250,12 @@
void sound_unlink(struct bContext *C, struct bSound* sound)
{
- bSound *snd;
Scene *scene;
SoundHandle *handle;
// XXX unused currently
#if 0
+ bSound *snd;
for(snd = CTX_data_main(C)->sound.first; snd; snd = snd->id.next)
{
if(snd->child_sound == sound)
Modified: branches/blender2.5/blender/source/blender/blenlib/BLI_fileops.h
===================================================================
--- branches/blender2.5/blender/source/blender/blenlib/BLI_fileops.h 2009-09-06 07:22:32 UTC (rev 23029)
+++ branches/blender2.5/blender/source/blender/blenlib/BLI_fileops.h 2009-09-06 13:20:05 UTC (rev 23030)
@@ -36,8 +36,6 @@
#ifndef BLI_FILEOPS_H
#define BLI_FILEOPS_H
-
-
void BLI_recurdir_fileops(char *dirname);
int BLI_link(char *file, char *to);
int BLI_is_writable(char *filename);
Modified: branches/blender2.5/blender/source/blender/blenlib/BLI_winstuff.h
===================================================================
--- branches/blender2.5/blender/source/blender/blenlib/BLI_winstuff.h 2009-09-06 07:22:32 UTC (rev 23029)
+++ branches/blender2.5/blender/source/blender/blenlib/BLI_winstuff.h 2009-09-06 13:20:05 UTC (rev 23030)
@@ -65,24 +65,7 @@
extern "C" {
#endif
-# ifndef _WIN64
- #ifndef M_PI
- #define M_PI 3.14159265358979323846
- #endif
- #ifndef M_PI_2
- #define M_PI_2 1.57079632679489661923
- #endif
- #ifndef M_SQRT2
- #define M_SQRT2 1.41421356237309504880
- #endif
- #ifndef M_SQRT1_2
- #define M_SQRT1_2 0.70710678118654752440
- #endif
- #ifndef M_1_PI
- #define M_1_PI 0.318309886183790671538
- #endif
-#endif
-
+#define _USE_MATH_DEFINES
#define MAXPATHLEN MAX_PATH
#ifndef S_ISREG
@@ -92,6 +75,18 @@
#define S_ISDIR(x) ((x&S_IFMT) == S_IFDIR)
#endif
+/* defines for using ISO C++ conformant names */
+#define open _open
+#define close _close
+#define write _write
+#define read _read
+#define getcwd _getcwd
+#define chdir _chdir
+#define strdup _strdup
+#define lseek _lseek
+#define getpid _getpid
+#define snprintf _snprintf
+
#ifndef FREE_WINDOWS
typedef unsigned int mode_t;
#endif
Modified: branches/blender2.5/blender/source/blender/blenlib/intern/bpath.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenlib/intern/bpath.c 2009-09-06 07:22:32 UTC (rev 23029)
+++ branches/blender2.5/blender/source/blender/blenlib/intern/bpath.c 2009-09-06 13:20:05 UTC (rev 23030)
@@ -26,6 +26,24 @@
* ***** END GPL LICENSE BLOCK *****
*/
+#include <sys/stat.h>
+#include <sys/types.h>
+
+#include <fcntl.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <string.h>
+
+/* path/file handeling stuff */
+#ifndef WIN32
+ #include <dirent.h>
+ #include <unistd.h>
+#else
+ #include <io.h>
+ #include "BLI_winstuff.h"
+#endif
+
#include "MEM_guardedalloc.h"
#include "DNA_ID.h" /* Library */
@@ -53,24 +71,8 @@
//XXX define below from BSE_sequence.h - otherwise potentially odd behaviour
#define SEQ_HAS_PATH(seq) (seq->type==SEQ_MOVIE || seq->type==SEQ_IMAGE)
-/* path/file handeling stuff */
-#ifndef WIN32
- #include <dirent.h>
- #include <unistd.h>
-#else
- #include "BLI_winstuff.h"
- #include <io.h>
-#endif
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <string.h>
-
#define FILE_MAX 240
/* TODO - BPATH_PLUGIN, BPATH_SEQ */
Modified: branches/blender2.5/blender/source/blender/blenlib/intern/fileops.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenlib/intern/fileops.c 2009-09-06 07:22:32 UTC (rev 23029)
+++ branches/blender2.5/blender/source/blender/blenlib/intern/fileops.c 2009-09-06 13:20:05 UTC (rev 23030)
@@ -31,27 +31,29 @@
#include <stdio.h>
#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+#include <errno.h>
+
#include "zlib.h"
#ifdef WIN32
+#include <io.h>
#include "BLI_winstuff.h"
-#include <io.h>
#else
#include <unistd.h> // for read close
#include <sys/param.h>
#endif
+
#include "BLI_blenlib.h"
#include "BLI_storage.h"
#include "BLI_fileops.h"
#include "BLI_callbacks.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
#include "BKE_utildefines.h"
-#include <errno.h>
#include "BLO_sys_types.h" // for intptr_t support
Modified: branches/blender2.5/blender/source/blender/blenlib/intern/storage.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenlib/intern/storage.c 2009-09-06 07:22:32 UTC (rev 23029)
+++ branches/blender2.5/blender/source/blender/blenlib/intern/storage.c 2009-09-06 13:20:05 UTC (rev 23030)
@@ -33,13 +33,6 @@
#include <stdio.h>
#include <stdlib.h>
-#ifdef WIN32
-#include "BLI_winstuff.h"
-#include <sys/types.h>
-#include <io.h>
-#include <direct.h>
-#endif
-
#ifndef WIN32
#include <dirent.h>
#endif
@@ -82,6 +75,14 @@
#include <malloc.h>
#endif
+#ifdef WIN32
+#include <sys/types.h>
+#include <io.h>
+#include <direct.h>
+#include "BLI_winstuff.h"
+#endif
+
+
/* lib includes */
#include "MEM_guardedalloc.h"
Modified: branches/blender2.5/blender/source/blender/blenloader/intern/readblenentry.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenloader/intern/readblenentry.c 2009-09-06 07:22:32 UTC (rev 23029)
+++ branches/blender2.5/blender/source/blender/blenloader/intern/readblenentry.c 2009-09-06 13:20:05 UTC (rev 23030)
@@ -32,13 +32,14 @@
#include <config.h>
#endif
-#include "BLI_storage.h" /* _LARGEFILE_SOURCE */
-
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <math.h>
+
+#include "BLI_storage.h" /* _LARGEFILE_SOURCE */
+
#include "MEM_guardedalloc.h"
#include "BLI_blenlib.h"
@@ -67,6 +68,10 @@
#include "BLO_sys_types.h" // needed for intptr_t
+#ifdef _WIN32
+#include "BLI_winstuff.h"
+#endif
+
/**
* IDType stuff, I plan to move this
* out into its own file + prefix, and
Modified: branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c 2009-09-06 07:22:32 UTC (rev 23029)
+++ branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c 2009-09-06 13:20:05 UTC (rev 23030)
@@ -29,11 +29,6 @@
#include "zlib.h"
-#ifdef WIN32
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list