[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14116] trunk/blender: compiler warning cleanup

[Stephen Swaney]

Revision: 14116
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14116
Author:   stiv
Date:     2008-03-15 15:41:47 +0100 (Sat, 15 Mar 2008)

Log Message:
-----------
compiler warning cleanup

Modified Paths:
--------------
    trunk/blender/intern/guardedalloc/intern/mallocn.c
    trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_tonemap.c
    trunk/blender/source/blender/src/buttons_editing.c

Modified: trunk/blender/intern/guardedalloc/intern/mallocn.c
===================================================================
--- trunk/blender/intern/guardedalloc/intern/mallocn.c	2008-03-14 20:11:43 UTC (rev 14115)
+++ trunk/blender/intern/guardedalloc/intern/mallocn.c	2008-03-15 14:41:47 UTC (rev 14116)
@@ -114,8 +114,8 @@
 volatile int totblock= 0;
 volatile unsigned long mem_in_use= 0, mmap_in_use= 0;
 
-volatile static struct localListBase _membase;
-volatile static struct localListBase *membase = &_membase;
+static volatile struct localListBase _membase;
+static volatile struct localListBase *membase = &_membase;
 static void (*error_callback)(char *) = NULL;
 static void (*thread_lock_callback)(void) = NULL;
 static void (*thread_unlock_callback)(void) = NULL;

Modified: trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_tonemap.c
===================================================================
--- trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_tonemap.c	2008-03-14 20:11:43 UTC (rev 14115)
+++ trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_tonemap.c	2008-03-15 14:41:47 UTC (rev 14116)
@@ -63,7 +63,7 @@
 }
 
 
-void static tonemap(NodeTonemap* ntm, CompBuf* dst, CompBuf* src)
+static void tonemap(NodeTonemap* ntm, CompBuf* dst, CompBuf* src)
 {
 	int x, y;
 	float dr, dg, db, al, igm = (ntm->gamma==0.f) ? 1 : (1.f / ntm->gamma);

Modified: trunk/blender/source/blender/src/buttons_editing.c
===================================================================
--- trunk/blender/source/blender/src/buttons_editing.c	2008-03-14 20:11:43 UTC (rev 14115)
+++ trunk/blender/source/blender/src/buttons_editing.c	2008-03-15 14:41:47 UTC (rev 14116)
@@ -2686,7 +2686,7 @@
 
 static void set_unicode_text_fs(char *file)
 {
-	if (file > 0) paste_unicodeText(file); 
+	if (file) paste_unicodeText(file); 
 }
 
 void do_fontbuts(unsigned short event)