[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49021] branches/soc-2012-swiss_cheese/ source/blender/gpu/GPU_object.h: Apparently structs need to be declared ' extern "C"' in order to link correctly (in MSVC2008 at least).

[Jason Wilkins]

Revision: 49021
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49021
Author:   jwilkins
Date:     2012-07-18 10:25:27 +0000 (Wed, 18 Jul 2012)
Log Message:
-----------
Apparently structs need to be declared 'extern "C"' in order to link correctly 
(in MSVC2008 at least).

Modified Paths:
--------------
    branches/soc-2012-swiss_cheese/source/blender/gpu/GPU_object.h

Modified: branches/soc-2012-swiss_cheese/source/blender/gpu/GPU_object.h
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/gpu/GPU_object.h      
2012-07-18 10:24:47 UTC (rev 49020)
+++ branches/soc-2012-swiss_cheese/source/blender/gpu/GPU_object.h      
2012-07-18 10:25:27 UTC (rev 49021)
@@ -3,20 +3,16 @@
        void (*gpuVertexPointer)(int size, int type, int stride, const void 
*pointer);
        void (*gpuNormalPointer)(          int type, int stride, const void 
*pointer);
        void (*gpuColorPointer )(int size, int type, int stride, const void 
*pointer);  
-
-
-
-
-
 } GPU_object_func;
 
-extern GPU_object_func gpugameobj;
 
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+extern GPU_object_func gpugameobj;
+
 void GPU_init_object_func(void);
 
 #ifdef __cplusplus

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs