From cd972535027a73ba70069051fe9038b6a8b5696a Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 3 Dec 2010 12:30:59 +0000 Subject: - added GCC warning -Wstrict-prototypes - fixed bug in paste material, exposed by stricter warnings. - removed/renamed various shadowed vars. - removed BGE lamp.colour, only allow lamp.color attribute. --- intern/audaspace/intern/AUD_C-API.h | 14 +++++++------- intern/audaspace/intern/AUD_PyInit.h | 2 +- intern/ghost/GHOST_Path-api.h | 6 +++--- intern/ghost/GHOST_Types.h | 2 +- intern/guardedalloc/intern/mallocn.c | 4 ++-- intern/memutil/MEM_CacheLimiterC-Api.h | 2 +- intern/opennl/CMakeLists.txt | 3 +++ intern/opennl/extern/ONL_opennl.h | 2 +- intern/opennl/superlu/util.h | 2 +- 9 files changed, 20 insertions(+), 17 deletions(-) (limited to 'intern') diff --git a/intern/audaspace/intern/AUD_C-API.h b/intern/audaspace/intern/AUD_C-API.h index 08f2845de4f..71b5ca82430 100644 --- a/intern/audaspace/intern/AUD_C-API.h +++ b/intern/audaspace/intern/AUD_C-API.h @@ -58,7 +58,7 @@ typedef struct /** * Initializes FFMPEG if it is enabled. */ -extern void AUD_initOnce(); +extern void AUD_initOnce(void); /** * Initializes an audio device. @@ -72,17 +72,17 @@ extern int AUD_init(AUD_DeviceType device, AUD_DeviceSpecs specs, int buffersize /** * Unitinitializes an audio device. */ -extern void AUD_exit(); +extern void AUD_exit(void); /** * Locks the playback device. */ -extern void AUD_lock(); +extern void AUD_lock(void); /** * Unlocks the device. */ -extern void AUD_unlock(); +extern void AUD_unlock(void); /** * Returns information about a sound. @@ -471,9 +471,9 @@ extern void AUD_muteSequencer(AUD_Sound* sequencer, AUD_SequencerEntry* entry, extern int AUD_readSound(AUD_Sound* sound, sample_t* buffer, int length); -extern void AUD_startPlayback(); +extern void AUD_startPlayback(void); -extern void AUD_stopPlayback(); +extern void AUD_stopPlayback(void); extern void AUD_seekSequencer(AUD_Channel* handle, float time); @@ -483,7 +483,7 @@ extern float AUD_getSequencerPosition(AUD_Channel* handle); extern void AUD_setSyncCallback(AUD_syncFunction function, void* data); #endif -extern int AUD_doesPlayback(); +extern int AUD_doesPlayback(void); #ifdef __cplusplus } diff --git a/intern/audaspace/intern/AUD_PyInit.h b/intern/audaspace/intern/AUD_PyInit.h index 0b80b3a9ae1..6f18bdbe2d1 100644 --- a/intern/audaspace/intern/AUD_PyInit.h +++ b/intern/audaspace/intern/AUD_PyInit.h @@ -36,7 +36,7 @@ extern "C" { /** * Initalizes the Python module. */ -extern PyObject* AUD_initPython(); +extern PyObject* AUD_initPython(void); #ifdef __cplusplus } diff --git a/intern/ghost/GHOST_Path-api.h b/intern/ghost/GHOST_Path-api.h index c38a4e2de88..60b05f55b90 100644 --- a/intern/ghost/GHOST_Path-api.h +++ b/intern/ghost/GHOST_Path-api.h @@ -41,20 +41,20 @@ extern "C" { * "unpack and run" path, then look for properly installed path, not including versioning. * @return Unsigned char string pointing to system dir (eg /usr/share/blender/). */ -extern const GHOST_TUns8* GHOST_getSystemDir(); +extern const GHOST_TUns8* GHOST_getSystemDir(void); /** * Determine the base dir in which user configuration is stored, not including versioning. * @return Unsigned char string pointing to user dir (eg ~). */ -extern const GHOST_TUns8* GHOST_getUserDir(); +extern const GHOST_TUns8* GHOST_getUserDir(void); /** * Determine the dir in which the binary file is found. * @return Unsigned char string pointing to binary dir (eg ~/usr/local/bin/). */ -extern const GHOST_TUns8* GHOST_getBinaryDir(); +extern const GHOST_TUns8* GHOST_getBinaryDir(void); #ifdef __cplusplus } diff --git a/intern/ghost/GHOST_Types.h b/intern/ghost/GHOST_Types.h index 20b69611bfb..3770bbde425 100644 --- a/intern/ghost/GHOST_Types.h +++ b/intern/ghost/GHOST_Types.h @@ -444,7 +444,7 @@ typedef struct { GHOST_TUns64 delta; } GHOST_TEventNDOFData; -typedef int (*GHOST_NDOFLibraryInit_fp)(); +typedef int (*GHOST_NDOFLibraryInit_fp)(void); typedef void (*GHOST_NDOFLibraryShutdown_fp)(void* deviceHandle); typedef void* (*GHOST_NDOFDeviceOpen_fp)(void* platformData); diff --git a/intern/guardedalloc/intern/mallocn.c b/intern/guardedalloc/intern/mallocn.c index 20912385f3b..d1e88748de4 100644 --- a/intern/guardedalloc/intern/mallocn.c +++ b/intern/guardedalloc/intern/mallocn.c @@ -177,13 +177,13 @@ static void print_error(const char *str, ...) if (error_callback) error_callback(buf); } -static void mem_lock_thread() +static void mem_lock_thread(void) { if (thread_lock_callback) thread_lock_callback(); } -static void mem_unlock_thread() +static void mem_unlock_thread(void) { if (thread_unlock_callback) thread_unlock_callback(); diff --git a/intern/memutil/MEM_CacheLimiterC-Api.h b/intern/memutil/MEM_CacheLimiterC-Api.h index 898625a9563..0e53a0b0e0d 100644 --- a/intern/memutil/MEM_CacheLimiterC-Api.h +++ b/intern/memutil/MEM_CacheLimiterC-Api.h @@ -39,7 +39,7 @@ typedef void(*MEM_CacheLimiter_Destruct_Func)(void*); #ifndef __MEM_cache_limiter_h_included__ extern void MEM_CacheLimiter_set_maximum(int m); -extern int MEM_CacheLimiter_get_maximum(); +extern int MEM_CacheLimiter_get_maximum(void); #endif /** * Create new MEM_CacheLimiter object diff --git a/intern/opennl/CMakeLists.txt b/intern/opennl/CMakeLists.txt index 9960511eff9..46a22650f4b 100644 --- a/intern/opennl/CMakeLists.txt +++ b/intern/opennl/CMakeLists.txt @@ -24,6 +24,9 @@ # # ***** END GPL LICENSE BLOCK ***** +# External project, better not fix warnings. +REMOVE_STRICT_FLAGS() + SET(INC extern superlu diff --git a/intern/opennl/extern/ONL_opennl.h b/intern/opennl/extern/ONL_opennl.h index be76aa95eac..c87cb7ef146 100644 --- a/intern/opennl/extern/ONL_opennl.h +++ b/intern/opennl/extern/ONL_opennl.h @@ -136,7 +136,7 @@ void nlMatrixMultiply(NLfloat *x, NLfloat *y); /* Solve */ void nlPrintMatrix(void); -NLboolean nlSolve(); +NLboolean nlSolve(void); NLboolean nlSolveAdvanced(NLint *permutation, NLboolean solveAgain); #ifdef __cplusplus diff --git a/intern/opennl/superlu/util.h b/intern/opennl/superlu/util.h index 1a3526d4e7e..953242d606d 100644 --- a/intern/opennl/superlu/util.h +++ b/intern/opennl/superlu/util.h @@ -246,7 +246,7 @@ extern void heap_relax_snode (const int, int *, const int, int *, int *); extern void resetrep_col (const int, const int *, int *); extern int spcoletree (int *, int *, int *, int, int, int *); extern int *TreePostorder (int, int *); -extern double SuperLU_timer_ (); +extern double SuperLU_timer_ (void); extern int sp_ienv (int); extern int lsame_ (char *, char *); extern int xerbla_ (char *, int *); -- cgit v1.2.3