code cleanup: quiet warnings for gcc's -Wundef, -Wmissing-declarations

diff --git a/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp b/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
index c3f3f46d188b44de56e9e0497eb5428c722846e1..f68d41f6a1c6126a602d8dcf0b3dc8329fc244aa 100644 (file)
--- a/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
+++ b/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
@@ -767,7 +767,7 @@ bool AUD_OpenALDevice::AUD_OpenALHandle::setConeVolumeOuter(float volume)
 /**************************** Threading Code **********************************/
 /******************************************************************************/
 
-void* AUD_openalRunThread(void* device)
+static void *AUD_openalRunThread(void *device)
 {
        AUD_OpenALDevice* dev = (AUD_OpenALDevice*)device;
        dev->updateStreams();
@@ -993,7 +993,7 @@ AUD_OpenALDevice::AUD_OpenALDevice(AUD_DeviceSpecs specs, int buffersize)
                AUD_THROW(AUD_ERROR_OPENAL, open_error);
 
        // at least try to set the frequency
-       ALCint attribs[] = { ALC_FREQUENCY, specs.rate, 0 };
+       ALCint attribs[] = { ALC_FREQUENCY, (ALCint)specs.rate, 0 };
        ALCint* attributes = attribs;
        if(specs.rate == AUD_RATE_INVALID)
                attributes = NULL;

diff --git a/intern/cycles/blender/blender_python.cpp b/intern/cycles/blender/blender_python.cpp
index 96d5bb61ff8e394f8f4b1f742e4aa978d8e5bb7c..d9220b76835e77bdc1df5bdcb81956b0ca1c2d20 100644 (file)
--- a/intern/cycles/blender/blender_python.cpp
+++ b/intern/cycles/blender/blender_python.cpp
@@ -183,7 +183,7 @@ static struct PyModuleDef module = {
        NULL, NULL, NULL, NULL
 };
 
-CCLDeviceInfo *compute_device_list(DeviceType type)
+static CCLDeviceInfo *compute_device_list(DeviceType type)
 {
        /* device list stored static */
        static ccl::vector<CCLDeviceInfo> device_list;

diff --git a/intern/dualcon/intern/Projections.cpp b/intern/dualcon/intern/Projections.cpp
index 2a52cc9972acf4fe461e30db6b7f1774629fe74d..f00d998591f01706a3d6a05135e6a26ba7de0077 100644 (file)
--- a/intern/dualcon/intern/Projections.cpp
+++ b/intern/dualcon/intern/Projections.cpp
@@ -92,12 +92,12 @@ static void crossProduct(double res[3], const double a[3], const double b[3])
 /**
  * Method to perform dot product
  */
-int64_t dotProduct(const int64_t a[3], const int64_t b[3])
+static int64_t dotProduct(const int64_t a[3], const int64_t b[3])
 {
        return a[0] * b[0] + a[1] * b[1] + a[2] * b[2];
 }
 
-void normalize(double a[3])
+static void normalize(double a[3])
 {
        double mag = a[0] * a[0] + a[1] * a[1] + a[2] * a[2];
        if (mag > 0) {

diff --git a/intern/dualcon/intern/dualcon_c_api.cpp b/intern/dualcon/intern/dualcon_c_api.cpp
index 894ab6b087392e23d9d85189e11506251a3390e2..c96415bfb54f44011a36b26e5ddb1a505fda720f 100644 (file)
--- a/intern/dualcon/intern/dualcon_c_api.cpp
+++ b/intern/dualcon/intern/dualcon_c_api.cpp
@@ -32,7 +32,7 @@
 #define isnan(n) _isnan(n)
 #endif
 
-void veccopy(float dst[3], const float src[3])
+static void veccopy(float dst[3], const float src[3])
 {
        dst[0] = src[0];
        dst[1] = src[1];

diff --git a/intern/dualcon/intern/octree.cpp b/intern/dualcon/intern/octree.cpp
index 9f44e7bbfdfa9ef6a0e41d209529c333127de171..c74f8bf2f461d2d2873d7e13349cc7d5e501ee04 100644 (file)
--- a/intern/dualcon/intern/octree.cpp
+++ b/intern/dualcon/intern/octree.cpp
@@ -345,11 +345,13 @@ void Octree::addTriangle(Triangle *trian, int triind)
        delete proj;
 }
 
-void print_depth(int height, int maxDepth)
+#if 0
+static void print_depth(int height, int maxDepth)
 {
        for (int i = 0; i < maxDepth - height; i++)
                printf("  ");
 }
+#endif
 
 InternalNode *Octree::addTriangle(InternalNode *node, CubeTriangleIsect *p, int height)
 {
@@ -2108,8 +2110,8 @@ void pseudoInverse(const _Matrix_Type_ &a,
                 svd.matrixU().adjoint();
 }
 
-void solve_least_squares(const float halfA[], const float b[],
-                         const float midpoint[], float rvalue[])
+static void solve_least_squares(const float halfA[], const float b[],
+                                const float midpoint[], float rvalue[])
 {
        /* calculate pseudo-inverse */
        Eigen::MatrixXf A(3, 3), pinv(3, 3);
@@ -2126,8 +2128,8 @@ void solve_least_squares(const float halfA[], const float b[],
                rvalue[i] = result(i);
 }
 
-void minimize(float rvalue[3], float mp[3], const float pts[12][3],
-              const float norms[12][3], const int parity[12])
+static void minimize(float rvalue[3], float mp[3], const float pts[12][3],
+                     const float norms[12][3], const int parity[12])
 {
        float ata[6] = {0, 0, 0, 0, 0, 0};
        float atb[3] = {0, 0, 0};

diff --git a/intern/raskter/raskter.c b/intern/raskter/raskter.c
index 2fe9ac61a485393b371b9de2943cf1c3c967982c..92ec695baf07c6b2232dc3f00eb26806db88d595 100644 (file)
--- a/intern/raskter/raskter.c
+++ b/intern/raskter/raskter.c
@@ -417,7 +417,8 @@ static int rast_scan_fill(struct r_FillContext *ctx, struct PolyVert *verts, int
 }
 
 int PLX_raskterize(float(*base_verts)[2], int num_base_verts,
-                   float *buf, int buf_x, int buf_y) {
+                   float *buf, int buf_x, int buf_y)
+{
        int i;                                   /* i: Loop counter. */
        struct PolyVert *ply;                   /* ply: Pointer to a list of integer buffer-space vertex coordinates. */
        struct r_FillContext ctx = {0};

diff --git a/intern/smoke/intern/smoke_API.cpp b/intern/smoke/intern/smoke_API.cpp
index b45fef2650476fcc540d031337c0155dc3e3efe5..4bbf8e0a82b67eea03ade9101cac187d9b2cef33 100644 (file)
--- a/intern/smoke/intern/smoke_API.cpp
+++ b/intern/smoke/intern/smoke_API.cpp
@@ -28,7 +28,6 @@
  *  \ingroup smoke
  */
 
-
 #include "FLUID_3D.h"
 #include "WTURBULENCE.h"
 
@@ -36,6 +35,8 @@
 #include <stdlib.h>
 #include <math.h>
 
+#include "../extern/smoke_API.h"  /* to ensure valid prototypes */
+
 // y in smoke is z in blender
 extern "C" FLUID_3D *smoke_init(int *res, float *p0, float dtdef)
 {
@@ -283,10 +284,12 @@ extern "C" void smoke_get_ob_velocity(FLUID_3D *fluid, float **x, float **y, flo
        *z = fluid->_zVelocityOb;
 }
 
+#if 0
 extern "C" unsigned char *smoke_get_obstacle_anim(FLUID_3D *fluid)
 {
        return fluid->_obstaclesAnim;
 }
+#endif
 
 extern "C" void smoke_turbulence_set_noise(WTURBULENCE *wt, int type)
 {

diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c
index e5d103ec9277c0d752da6b0434690cb5166dd7cd..3b3bc1ecedc5ca24de0ce6d680bebba968a70182 100644 (file)
--- a/source/blender/blenkernel/intern/tracking.c
+++ b/source/blender/blenkernel/intern/tracking.c
@@ -2029,7 +2029,7 @@ static void track_context_free(void *customdata)
 {
        TrackContext *track_context = (TrackContext *)customdata;
 
-#if WITH_LIBMV
+#ifdef WITH_LIBMV
        if (track_context->search_area)
                MEM_freeN(track_context->search_area);
 
@@ -2776,7 +2776,7 @@ static int reconstruct_count_tracks_on_both_keyframes(MovieTracking *tracking, L
 
 int BKE_tracking_reconstruction_check(MovieTracking *tracking, MovieTrackingObject *object, char *error_msg, int error_size)
 {
-#if WITH_LIBMV
+#ifdef WITH_LIBMV
        ListBase *tracksbase = BKE_tracking_object_get_tracks(tracking, object);
 
        if (tracking->settings.motion_flag & TRACKING_MOTION_MODAL) {

diff --git a/source/blender/bmesh/intern/bmesh_mesh.c b/source/blender/bmesh/intern/bmesh_mesh.c
index cf593627e8d4e754bb7460b4a6ae9da8c8d37407..882dcce3ae7ddbd55e630cb9ab4dd5ed57bb7e6d 100644 (file)
--- a/source/blender/bmesh/intern/bmesh_mesh.c
+++ b/source/blender/bmesh/intern/bmesh_mesh.c
@@ -356,7 +356,7 @@ void bmesh_edit_begin(BMesh *UNUSED(bm), int UNUSED(type_flag))
         * (loop cuts, edge subdivides, etc) are not reflected in the higher levels of
         * the mesh at all, which doesn't seem right. Turning off completely for now,
         * until this is shown to be better for certain types of mesh edits. */
-#if BMOP_UNTAN_MULTIRES_ENABLED
+#ifdef BMOP_UNTAN_MULTIRES_ENABLED
        /* switch multires data out of tangent space */
        if ((type_flag & BMO_OP_FLAG_UNTAN_MULTIRES) && CustomData_has_layer(&bm->ldata, CD_MDISPS)) {
                bmesh_mdisps_space_set(bm, MULTIRES_SPACE_TANGENT, MULTIRES_SPACE_ABSOLUTE);
@@ -374,7 +374,7 @@ void bmesh_edit_begin(BMesh *UNUSED(bm), int UNUSED(type_flag))
 void bmesh_edit_end(BMesh *bm, int UNUSED(flag))
 {
        /* BMO_OP_FLAG_UNTAN_MULTIRES disabled for now, see comment above in bmesh_edit_begin. */
-#if BMOP_UNTAN_MULTIRES_ENABLED
+#ifdef BMOP_UNTAN_MULTIRES_ENABLED
        /* switch multires data into tangent space */
        if ((flag & BMO_OP_FLAG_UNTAN_MULTIRES) && CustomData_has_layer(&bm->ldata, CD_MDISPS)) {
                /* set normals to their previous winding */

diff --git a/source/blender/compositor/intern/COM_MemoryBuffer.cpp b/source/blender/compositor/intern/COM_MemoryBuffer.cpp
index 0994f3f8890aeee755fa0dd384be85a74abb4f89..bdbe21f82ea1f3b4bd4e586950e98d489d802ad6 100644 (file)
--- a/source/blender/compositor/intern/COM_MemoryBuffer.cpp
+++ b/source/blender/compositor/intern/COM_MemoryBuffer.cpp
@@ -253,7 +253,7 @@ static void imp2radangle(float A, float B, float C, float F, float *a, float *b,
        }
 }
 
-float clipuv(float x, float limit)
+static float clipuv(float x, float limit)
 {
        x = (x < 0) ? 0 : ((x >= limit) ? (limit - 1) : x);
        return x;

diff --git a/source/blender/compositor/intern/COM_WorkScheduler.cpp b/source/blender/compositor/intern/COM_WorkScheduler.cpp
index f732a40e7682eb51330e8a3596536e9961739532..eb9c26d4f43385c8c8ce40a08a7ddcfda327aca7 100644 (file)
--- a/source/blender/compositor/intern/COM_WorkScheduler.cpp
+++ b/source/blender/compositor/intern/COM_WorkScheduler.cpp
@@ -25,6 +25,7 @@
 
 #include "BKE_global.h"
 
+#include "COM_compositor.h"
 #include "COM_WorkScheduler.h"
 #include "COM_CPUDevice.h"
 #include "COM_OpenCLDevice.h"
@@ -265,7 +266,7 @@ bool WorkScheduler::hasGPUDevices()
 #endif
 }
 
-extern void clContextError(const char *errinfo, const void *private_info, size_t cb, void *user_data)
+static void clContextError(const char *errinfo, const void *private_info, size_t cb, void *user_data)
 {
        printf("OPENCL error: %s\n", errinfo);
 }

diff --git a/source/blender/compositor/intern/COM_compositor.cpp b/source/blender/compositor/intern/COM_compositor.cpp
index 5cfcd83f8f15926a6c4f3f3e4bc2243332cd567c..49ab9db5dd849df855a57b22e7b556405271171f 100644 (file)
--- a/source/blender/compositor/intern/COM_compositor.cpp
+++ b/source/blender/compositor/intern/COM_compositor.cpp
@@ -37,7 +37,7 @@ extern "C" {
 static ThreadMutex s_compositorMutex;
 static char is_compositorMutex_init = FALSE;
 
-void intern_freeCompositorCaches() 
+static void intern_freeCompositorCaches()
 {
        deintializeDistortionCache();
 }
@@ -93,7 +93,7 @@ void COM_execute(RenderData *rd, bNodeTree *editingtree, int rendering,
        BLI_mutex_unlock(&s_compositorMutex);
 }
 
-void COM_freeCaches() 
+static void UNUSED_FUNCTION(COM_freeCaches)()
 {
        if (is_compositorMutex_init) {
                BLI_mutex_lock(&s_compositorMutex);
@@ -102,7 +102,7 @@ void COM_freeCaches()
        }
 }
 
-void COM_deinitialize() 
+void COM_deinitialize()
 {
        if (is_compositorMutex_init) {
                BLI_mutex_lock(&s_compositorMutex);

diff --git a/source/blender/compositor/operations/COM_GlareFogGlowOperation.cpp b/source/blender/compositor/operations/COM_GlareFogGlowOperation.cpp
index 7f7429bf2e61e78d07705d75d04999fa45467006..efdf0134c4b56e70406cac34f3108a396097a1f4 100644 (file)
--- a/source/blender/compositor/operations/COM_GlareFogGlowOperation.cpp
+++ b/source/blender/compositor/operations/COM_GlareFogGlowOperation.cpp
@@ -244,7 +244,7 @@ static void fht_convolve(fREAL *d1, fREAL *d2, unsigned int M, unsigned int N)
 }
 //------------------------------------------------------------------------------
 
-void convolve(float *dst, MemoryBuffer *in1, MemoryBuffer *in2)
+static void convolve(float *dst, MemoryBuffer *in1, MemoryBuffer *in2)
 {
        fREAL *data1, *data2, *fp;
        unsigned int w2, h2, hw, hh, log2_w, log2_h;

diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c
index ebacac917e86ab7a9e3ba6f8112276e7d324cf0d..c371a9ce945066419b6671b6c97f0960a6052b4e 100644 (file)
--- a/source/blender/editors/render/render_internal.c
+++ b/source/blender/editors/render/render_internal.c
@@ -80,7 +80,7 @@ void image_buffer_rect_update(Scene *scene, RenderResult *rr, ImBuf *ibuf, volat
        float *rectf = NULL;
        int ymin, ymax, xmin, xmax;
        int rymin, rxmin;
-       unsigned char *rectc;
+       /* unsigned char *rectc; */  /* UNUSED */
 
        /* if renrect argument, we only refresh scanlines */
        if (renrect) {
@@ -137,7 +137,7 @@ void image_buffer_rect_update(Scene *scene, RenderResult *rr, ImBuf *ibuf, volat
                imb_addrectImBuf(ibuf);
        
        rectf += 4 * (rr->rectx * ymin + xmin);
-       rectc = (unsigned char *)(ibuf->rect + ibuf->x * rymin + rxmin);
+       /* rectc = (unsigned char *)(ibuf->rect + ibuf->x * rymin + rxmin); */  /* UNUSED */
 
        IMB_partial_display_buffer_update(ibuf, rectf, NULL, rr->rectx, rxmin, rymin,
                                          &scene->view_settings, &scene->display_settings,

diff --git a/source/blender/editors/space_nla/nla_edit.c b/source/blender/editors/space_nla/nla_edit.c
index 403a8e0f8bc136fb450f1480a8a25345bf886d4d..950060dde5f82ebc28e5f5058a19ef794a6f014c 100644 (file)
--- a/source/blender/editors/space_nla/nla_edit.c
+++ b/source/blender/editors/space_nla/nla_edit.c
@@ -1170,7 +1170,8 @@ static int nlaedit_bake_exec(bContext *C, wmOperator *UNUSED(op))
        return OPERATOR_FINISHED;
 }
 
-static void NLA_OT_bake(wmOperatorType *ot)
+/* why isn't this used? */
+static void UNUSED_FUNCTION(NLA_OT_bake)(wmOperatorType *ot)
 {
        /* identifiers */
        ot->name = "Bake Strips";

diff --git a/source/blender/ikplugin/intern/itasc_plugin.cpp b/source/blender/ikplugin/intern/itasc_plugin.cpp
index c5722995d3278ee7fc02915a3d073cc13456b51f..d88f954345f552fee07b8470d1a30d117c0af70a 100644 (file)
--- a/source/blender/ikplugin/intern/itasc_plugin.cpp
+++ b/source/blender/ikplugin/intern/itasc_plugin.cpp
@@ -393,7 +393,7 @@ static bool constraint_valid(bConstraint *con)
        return true;
 }
 
-int initialize_scene(Object *ob, bPoseChannel *pchan_tip)
+static int initialize_scene(Object *ob, bPoseChannel *pchan_tip)
 {
        bConstraint *con;
        int treecount;

diff --git a/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp b/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
index 82f355e1bb24275da033631ebf89cd1761d613d3..d9d0cb86ee0a63f701a49aa4940dd2264a9fa62c 100644 (file)
--- a/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
+++ b/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
@@ -305,7 +305,7 @@ static const uint DDPF_SRGB = 0x40000000U;
        };
 
 
-       const char * getDxgiFormatString(DXGI_FORMAT dxgiFormat)
+       static const char * getDxgiFormatString(DXGI_FORMAT dxgiFormat)
        {
 #define CASE(format) case DXGI_FORMAT_##format: return #format
                switch (dxgiFormat)
@@ -429,7 +429,7 @@ static const uint DDPF_SRGB = 0x40000000U;
 #undef CASE
        }
        
-       const char * getD3d10ResourceDimensionString(D3D10_RESOURCE_DIMENSION resourceDimension)
+       static const char * getD3d10ResourceDimensionString(D3D10_RESOURCE_DIMENSION resourceDimension)
        {
                switch (resourceDimension)
                {
@@ -534,7 +534,7 @@ namespace
 
 } // namespace
 
-uint findD3D9Format(uint bitcount, uint rmask, uint gmask, uint bmask, uint amask)
+static uint findD3D9Format(uint bitcount, uint rmask, uint gmask, uint bmask, uint amask)
 {
     for (int i = 0; i < s_d3dFormatCount; i++)
         {

diff --git a/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp b/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
index ddc84408e26ec0692110c7f73ff71caf9a42ff78..3926e8b8e515c9ab2fd5eb20404647a4f15bc529 100644 (file)
--- a/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
+++ b/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
@@ -185,7 +185,7 @@ RTBuilder *rtbuild_get_child(RTBuilder *b, int child, RTBuilder *tmp)
        return tmp;
 }
 
-void rtbuild_calc_bb(RTBuilder *b)
+static void rtbuild_calc_bb(RTBuilder *b)
 {
        if (b->bb[0] == 1.0e30f) {
                for (RTBuilder::Object **index = b->sorted_begin[0]; index != b->sorted_end[0]; index++)

diff --git a/source/blender/render/intern/raytrace/rayobject_vbvh.cpp b/source/blender/render/intern/raytrace/rayobject_vbvh.cpp
index 9e7075438cb9d7e53f57931fad92391b6160b1d4..d6ae602d3e9c41604769abf590c4ccb027136eae 100644 (file)
--- a/source/blender/render/intern/raytrace/rayobject_vbvh.cpp
+++ b/source/blender/render/intern/raytrace/rayobject_vbvh.cpp
@@ -152,7 +152,7 @@ void bvh_hint_bb(Tree *tree, LCTSHint *hint, float *UNUSED(min), float *UNUSED(m
        }
 }
 
-void bfree(VBVHTree *tree)
+static void bfree(VBVHTree *tree)
 {
        if (tot_pushup + tot_pushdown + tot_hints + tot_moves) {
                if (G.debug & G_DEBUG) {

diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c
index 908f7e27f0b0e56c687b9946ecb4882d40fc64e2..ab9c2ac100363e8bfaacc1030d21445ca8fa7cf0 100644 (file)
--- a/source/blender/windowmanager/intern/wm_init_exit.c
+++ b/source/blender/windowmanager/intern/wm_init_exit.c
@@ -32,8 +32,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#if WIN32
-#include <Windows.h>
+#ifdef WIN32
+#  include <Windows.h>
 #endif
 
 #include "MEM_guardedalloc.h"
@@ -340,7 +340,7 @@ extern void free_anim_copybuf(void);
 extern void free_anim_drivers_copybuf(void);
 extern void free_fmodifiers_copybuf(void);
 
-#if WIN32
+#ifdef WIN32
 /* Read console events until there is a key event.  Also returns on any error. */
 static void wait_for_console_key(void)
 {