[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48285] branches/soc-2012-swiss_cheese/ source/blender: Fixes for gcc

[Alexander Kuznetsov]

Revision: 48285
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48285
Author:   alexk
Date:     2012-06-25 18:44:59 +0000 (Mon, 25 Jun 2012)
Log Message:
-----------
Fixes for gcc

Modified Paths:
--------------
    branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate.c
    branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate.h
    branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_primitives.c
    branches/soc-2012-swiss_cheese/source/blender/windowmanager/intern/wm_init_exit.c

Modified: branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate.c
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate.c	2012-06-25 18:03:19 UTC (rev 48284)
+++ branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate.c	2012-06-25 18:44:59 UTC (rev 48285)
@@ -770,7 +770,7 @@
 
 
 
-BLI_INLINE currentColor(void)
+BLI_INLINE void currentColor(void)
 {
 	GPU_IMMEDIATE->currentColor();
 

Modified: branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate.h
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate.h	2012-06-25 18:03:19 UTC (rev 48284)
+++ branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate.h	2012-06-25 18:44:59 UTC (rev 48285)
@@ -139,8 +139,8 @@
 #define GPU_CHECK_FORMAT()
 #define GPU_CHECK_CAN_REPEAT()
 
-#define GPU_CURRENT_COLOR_VALID  (valid)
-#define GPU_CURRENT_NORMAL_VALID (valid)
+#define GPU_CURRENT_COLOR_VALID(valid)
+#define GPU_CURRENT_NORMAL_VALID(valid)
 
 #endif
 

Modified: branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_primitives.c
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_primitives.c	2012-06-25 18:03:19 UTC (rev 48284)
+++ branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_primitives.c	2012-06-25 18:44:59 UTC (rev 48285)
@@ -748,7 +748,7 @@
 	//	y[0] = y[1];
 	//}
 
-BLI_INLINE primFormat(GPUprim3 *prim)
+BLI_INLINE void primFormat(GPUprim3 *prim)
 {
 	GPU_ASSERT(
 		ELEM3(prim->normals,

Modified: branches/soc-2012-swiss_cheese/source/blender/windowmanager/intern/wm_init_exit.c
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/windowmanager/intern/wm_init_exit.c	2012-06-25 18:03:19 UTC (rev 48284)
+++ branches/soc-2012-swiss_cheese/source/blender/windowmanager/intern/wm_init_exit.c	2012-06-25 18:44:59 UTC (rev 48285)
@@ -124,7 +124,7 @@
 int wm_start_with_console = 0; /* used in creator.c */
 
 static GPUimmediate* immediate;
-static GPUindex*     index;
+static GPUindex*     gindex;
 
 /* only called once, for startup */
 void WM_init(bContext *C, int argc, const char **argv)
@@ -190,8 +190,8 @@
 		gpuImmediateMakeCurrent(immediate);
 		gpuImmediateMaxVertexCount(500000); // XXX: temporary!
 
-		index = gpuNewIndex();
-		gpuImmediateIndex(index);
+		gindex = gpuNewIndex();
+		gpuImmediateIndex(gindex);
 		gpuImmediateMaxIndexCount(500000); // XXX: temporary!
 
 		UI_init();
@@ -431,7 +431,7 @@
 	if (!G.background) {
 		BKE_undo_save_quit();  /* saves quit.blend if global undo is on */
 
-		gpuDeleteIndex(index);
+		gpuDeleteIndex(gindex);
 		gpuImmediateIndex(NULL);
 
 		gpuImmediateMakeCurrent(NULL);