[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45194] trunk/blender: SVN maintenance.

[gsr b3d]

Revision: 45194
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45194
Author:   gsrb3d
Date:     2012-03-26 22:44:23 +0000 (Mon, 26 Mar 2012)
Log Message:
-----------
SVN maintenance.

Modified Paths:
--------------
    trunk/blender/extern/eltopo/common/runstats.h

Property Changed:
----------------
    trunk/blender/intern/cycles/kernel/svm/svm_ramp.h
    trunk/blender/scons/scons-local-1.2.0.d20090223/SCons/compat/_scons_shlex.py

Modified: trunk/blender/extern/eltopo/common/runstats.h
===================================================================
--- trunk/blender/extern/eltopo/common/runstats.h	2012-03-26 22:36:32 UTC (rev 45193)
+++ trunk/blender/extern/eltopo/common/runstats.h	2012-03-26 22:44:23 UTC (rev 45194)
@@ -12,26 +12,26 @@
 #define RUNSTATS_H
 
 #include <map>
-#include <string>
-#  if _MSC_VER < 1600
-// stdint.h is not available before VS2010
-#if defined(_WIN32) && !defined(__MINGW32__)
-/* The __intXX are built-in types of the visual complier! So we don't
-   need to include anything else here.
-   This typedefs should be in sync with types from MEM_sys_types.h */
-
-typedef signed __int8  int8_t;
-typedef signed __int16 int16_t;
-typedef signed __int32 int32_t;
-
-typedef unsigned __int8  uint8_t;
-typedef unsigned __int16 uint16_t;
-typedef unsigned __int32 uint32_t;
-#endif
-typedef __int64 int64_t;
-typedef unsigned __int64 uint64_t;
-#  else
-#    include <stdint.h>
+#include <string>
+#  if _MSC_VER < 1600
+// stdint.h is not available before VS2010
+#if defined(_WIN32) && !defined(__MINGW32__)
+/* The __intXX are built-in types of the visual complier! So we don't
+   need to include anything else here.
+   This typedefs should be in sync with types from MEM_sys_types.h */
+
+typedef signed __int8  int8_t;
+typedef signed __int16 int16_t;
+typedef signed __int32 int32_t;
+
+typedef unsigned __int8  uint8_t;
+typedef unsigned __int16 uint16_t;
+typedef unsigned __int32 uint32_t;
+#endif
+typedef __int64 int64_t;
+typedef unsigned __int64 uint64_t;
+#  else
+#    include <stdint.h>
 #  endif
 #include <vector>
 


Property changes on: trunk/blender/intern/cycles/kernel/svm/svm_ramp.h
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: trunk/blender/scons/scons-local-1.2.0.d20090223/SCons/compat/_scons_shlex.py
___________________________________________________________________
Added: svn:eol-style
   + native