[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46999] branches/soc-2012-swiss_cheese/ source/blender/gpu/intern: fixes for gcc

[Jason Wilkins]

Revision: 46999
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46999
Author:   jwilkins
Date:     2012-05-25 03:28:24 +0000 (Fri, 25 May 2012)
Log Message:
-----------
fixes for gcc

difference between (void) and ()

gave GPU_IMMEDIATE an initializer so it was not considered "common"

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_inline.h
    branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate_internal.h

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-05-25 03:14:51 UTC (rev 46998)
+++ branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate.c	2012-05-25 03:28:24 UTC (rev 46999)
@@ -38,11 +38,11 @@
 
 
 /* global symbol needed because the immediate drawing functons are inline */
-GPUimmediate *restrict GPU_IMMEDIATE;
+GPUimmediate *restrict GPU_IMMEDIATE = NULL;
 
 
 
-GLsizei gpu_calc_stride()
+GLsizei gpu_calc_stride(void)
 {
 	size_t i;
 	size_t stride = 0;
@@ -163,7 +163,7 @@
 
 GPUimmediate *restrict gpuNewImmediate(void)
 {
-	GPUimmediate* immediate =
+	GPUimmediate *restrict immediate =
 		MEM_callocN(sizeof(GPUimmediate), "GPUimmediate");
 
 	assert(immediate);

Modified: branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate_inline.h
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate_inline.h	2012-05-25 03:14:51 UTC (rev 46998)
+++ branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate_inline.h	2012-05-25 03:28:24 UTC (rev 46999)
@@ -347,7 +347,7 @@
 
 
 
-BLI_INLINE void gpuEnd()
+BLI_INLINE void gpuEnd(void)
 {
 	GPU_CHECK_IMMEDIATE();
 

Modified: branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate_internal.h
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate_internal.h	2012-05-25 03:14:51 UTC (rev 46998)
+++ branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate_internal.h	2012-05-25 03:28:24 UTC (rev 46999)
@@ -52,7 +52,7 @@
 
 
 
-GLsizei gpu_calc_stride();
+GLsizei gpu_calc_stride(void);