[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46998] branches/soc-2012-swiss_cheese/ source/blender/gpu/intern/gpu_immediate.c: conflicting qualifiers on certain functions

Jason Wilkins Jason.A.Wilkins at gmail.com
Fri May 25 05:14:57 CEST 2012


Revision: 46998
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46998
Author:   jwilkins
Date:     2012-05-25 03:14:51 +0000 (Fri, 25 May 2012)
Log Message:
-----------
conflicting qualifiers on certain functions

Modified Paths:
--------------
    branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate.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-05-25 03:04:54 UTC (rev 46997)
+++ branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate.c	2012-05-25 03:14:51 UTC (rev 46998)
@@ -38,7 +38,7 @@
 
 
 /* global symbol needed because the immediate drawing functons are inline */
-GPUimmediate* GPU_IMMEDIATE;
+GPUimmediate *restrict GPU_IMMEDIATE;
 
 
 
@@ -161,7 +161,7 @@
 
 
 
-GPUimmediate* gpuNewImmediate(void)
+GPUimmediate *restrict gpuNewImmediate(void)
 {
 	GPUimmediate* immediate =
 		MEM_callocN(sizeof(GPUimmediate), "GPUimmediate");
@@ -192,14 +192,14 @@
 
 
 
-void gpuImmediateMakeCurrent(GPUimmediate* immediate)
+void gpuImmediateMakeCurrent(GPUimmediate *restrict immediate)
 {
 	GPU_IMMEDIATE = immediate;
 }
 
 
 
-void gpuDeleteImmediate(GPUimmediate* immediate)
+void gpuDeleteImmediate(GPUimmediate *restrict immediate)
 {
 	assert(immediate);
 




More information about the Bf-blender-cvs mailing list