[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59701] trunk/blender/source/blender/ blenlib/BLI_jitter.h: Mingw/Windows Compiling Fix:

[Joshua Leung]

Revision: 59701
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59701
Author:   aligorith
Date:     2013-09-01 05:55:50 +0000 (Sun, 01 Sep 2013)
Log Message:
-----------
Mingw/Windows Compiling Fix:

In file included from source\blender\compositor\operations\COM_PlaneTrackMaskOperation.cpp:31:0:
source\blender\blenlib/BLI_jitter.h:36:65: error: expected ',' or '...' before numeric constant
source\blender\blenlib/BLI_jitter.h:37:65: error: expected ',' or '...' before numeric constant


It appears that an include used in COM_PlaneTrackMaskOperation.cpp brings in some Windows header file, which in turn defines rad/rad1/rad2 as some numeric constants.

Modified Paths:
--------------
    trunk/blender/source/blender/blenlib/BLI_jitter.h

Modified: trunk/blender/source/blender/blenlib/BLI_jitter.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_jitter.h	2013-09-01 05:36:29 UTC (rev 59700)
+++ trunk/blender/source/blender/blenlib/BLI_jitter.h	2013-09-01 05:55:50 UTC (rev 59701)
@@ -33,8 +33,8 @@
  */
 
 void    BLI_jitter_init(float *jitarr, int num);
-void    BLI_jitterate1(float *jit1, float *jit2, int num, float rad1);
-void    BLI_jitterate2(float *jit1, float *jit2, int num, float rad2);
+void    BLI_jitterate1(float *jit1, float *jit2, int num, float radius1);
+void    BLI_jitterate2(float *jit1, float *jit2, int num, float radius2);
 
 #endif