diff options
| author | Stephen Swaney <sswaney@centurytel.net> | 2008-03-15 17:41:47 +0300 |
|---|---|---|
| committer | Stephen Swaney <sswaney@centurytel.net> | 2008-03-15 17:41:47 +0300 |
| commit | bb48a75c37e85fd5cc77ebd1c585f575932fb305 (patch) | |
| tree | 7140e104c9ced1ac5793063d7fccb9ba492c9ee2 | |
| parent | 4f553a59f7637661ce41cfdabfdf97c37517ad73 (diff) | |
compiler warning cleanup
| -rw-r--r-- | intern/guardedalloc/intern/mallocn.c | 4 | ||||
| -rw-r--r-- | source/blender/nodes/intern/CMP_nodes/CMP_tonemap.c | 2 | ||||
| -rw-r--r-- | source/blender/src/buttons_editing.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/intern/guardedalloc/intern/mallocn.c b/intern/guardedalloc/intern/mallocn.c index 20d3a5b07fc..af9443428f7 100644 --- a/intern/guardedalloc/intern/mallocn.c +++ b/intern/guardedalloc/intern/mallocn.c @@ -114,8 +114,8 @@ static const char *check_memlist(MemHead *memh); 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; diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_tonemap.c b/source/blender/nodes/intern/CMP_nodes/CMP_tonemap.c index 662d8e8dde9..5e1803a6774 100644 --- a/source/blender/nodes/intern/CMP_nodes/CMP_tonemap.c +++ b/source/blender/nodes/intern/CMP_nodes/CMP_tonemap.c @@ -63,7 +63,7 @@ static float avgLogLum(CompBuf *src, float* auto_key, float* Lav, float* Cav) } -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); diff --git a/source/blender/src/buttons_editing.c b/source/blender/src/buttons_editing.c index edd9a2ff827..dc0a772d7da 100644 --- a/source/blender/src/buttons_editing.c +++ b/source/blender/src/buttons_editing.c @@ -2686,7 +2686,7 @@ static void load_buts_vfont(char *name) 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) |