warning cleanup.

- fix mistake with grease pencil UI (&& was intended but & used).
- use (void) rather then () across _all_ blenders code.
- a few minor edits, don't shadow stack variables in roll calculation & avoid running memset() for VBO vertex map.

2 files changed, 9 insertions, 9 deletions

diff --git a/source/blender/gpu/intern/gpu_buffers.c b/source/blender/gpu/intern/gpu_buffers.c
index 0a419af5b06..53e3ad09a6f 100644
--- a/source/blender/gpu/intern/gpu_buffers.c
+++ b/source/blender/gpu/intern/gpu_buffers.c
@@ -65,7 +65,7 @@ static GPUBufferPool *globalPool = 0;
 static int GLStates = 0;
 static GPUAttrib attribData[MAX_GPU_ATTRIB_DATA] = { { -1, 0, 0 } };
 
-GPUBufferPool *GPU_buffer_pool_new()
+GPUBufferPool *GPU_buffer_pool_new(void)
 {
 	GPUBufferPool *pool;
 
@@ -1514,7 +1514,7 @@ void GPU_interleaved_attrib_setup( GPUBuffer *buffer, GPUAttrib data[], int numd
 }
 
 
-void GPU_buffer_unbind()
+void GPU_buffer_unbind(void)
 {
 	int i;
 	DEBUG_VBO("GPU_buffer_unbind\n");
diff --git a/source/blender/gpu/intern/gpu_extensions.c b/source/blender/gpu/intern/gpu_extensions.c
index bff4287bd75..c0c3cc128af 100644
--- a/source/blender/gpu/intern/gpu_extensions.c
+++ b/source/blender/gpu/intern/gpu_extensions.c
@@ -82,12 +82,12 @@ int GPU_type_matches(GPUDeviceType device, GPUOSType os, GPUDriverType driver)
 
 /* GPU Extensions */
 
-void GPU_extensions_disable()
+void GPU_extensions_disable(void)
 {
 	GG.extdisabled = 1;
 }
 
-void GPU_extensions_init()
+void GPU_extensions_init(void)
 {
 	GLint r, g, b;
 	const char *vendor, *renderer;
@@ -183,12 +183,12 @@ void GPU_extensions_init()
 #endif
 }
 
-int GPU_glsl_support()
+int GPU_glsl_support(void)
 {
 	return !GG.extdisabled && GG.glslsupport;
 }
 
-int GPU_non_power_of_two_support()
+int GPU_non_power_of_two_support(void)
 {
 	/* Exception for buggy ATI/Apple driver in Mac OS X 10.5/10.6,
 	 * they claim to support this but can cause system freeze */
@@ -201,7 +201,7 @@ int GPU_non_power_of_two_support()
 	return GLEW_ARB_texture_non_power_of_two;
 }
 
-int GPU_color_depth()
+int GPU_color_depth(void)
 {
     return GG.colordepth;
 }
@@ -680,7 +680,7 @@ struct GPUFrameBuffer {
 	GPUTexture *depthtex;
 };
 
-GPUFrameBuffer *GPU_framebuffer_create()
+GPUFrameBuffer *GPU_framebuffer_create(void)
 {
 	GPUFrameBuffer *fb;
 
@@ -825,7 +825,7 @@ void GPU_framebuffer_free(GPUFrameBuffer *fb)
 	MEM_freeN(fb);
 }
 
-void GPU_framebuffer_restore()
+void GPU_framebuffer_restore(void)
 {
 	if (GG.currentfb != 0) {
 		glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);