code cleanup: unused defines, remove unused scanfill success value from BLI_scanfill_begin().

4 files changed, 23 insertions, 26 deletions

diff --git a/intern/elbeem/intern/simulation_object.cpp b/intern/elbeem/intern/simulation_object.cpp
index d89b28bbf7a..9e98adfc734 100644
--- a/intern/elbeem/intern/simulation_object.cpp
+++ b/intern/elbeem/intern/simulation_object.cpp
@@ -33,7 +33,7 @@
 LbmSolverInterface* createSolver();
 
 #if PARALLEL==1
-int omp_threadcache;
+static int omp_threadcache;
 #endif
 
 /******************************************************************************
@@ -71,7 +71,7 @@ SimulationObject::~SimulationObject()
   	if(mpParam)          delete mpParam;
 	if(mpParts)          delete mpParts;
 	debMsgStd("SimulationObject",DM_MSG,"El'Beem Done!\n",10);
-#if PARALLEL==1
+#if (PARALLEL == 1)
 	omp_set_num_threads(omp_threadcache);
 	printf("Resetting omp_threads to cached value %d \n", omp_threadcache);
 #endif
diff --git a/intern/smoke/intern/spectrum.cpp b/intern/smoke/intern/spectrum.cpp
index 30433451ac2..e1c2b4d1e42 100644
--- a/intern/smoke/intern/spectrum.cpp
+++ b/intern/smoke/intern/spectrum.cpp
@@ -52,8 +52,10 @@ struct colourSystem {
 
 /* White point chromaticities. */
 
+#if 0
 #define IlluminantC     0.3101, 0.3162	    	/* For NTSC television */
 #define IlluminantD65   0.3127, 0.3291	    	/* For EBU and SMPTE */
+#endif
 #define IlluminantE 	0.33333333, 0.33333333  /* CIE equal-energy illuminant */
 
 /*  Gamma of nonlinear correction.
diff --git a/source/blender/blenlib/BLI_scanfill.h b/source/blender/blenlib/BLI_scanfill.h
index ce2c6a4252f..0cbd4ee70b1 100644
--- a/source/blender/blenlib/BLI_scanfill.h
+++ b/source/blender/blenlib/BLI_scanfill.h
@@ -107,31 +107,14 @@ enum {
 	 * when this flag is set, we'll never get back more faces then (totvert - 2) */
 	BLI_SCANFILL_CALC_HOLES            = (1 << 2)
 };
-
-int BLI_scanfill_begin(ScanFillContext *sf_ctx);
-int BLI_scanfill_calc(ScanFillContext *sf_ctx, const int flag);
-int BLI_scanfill_calc_ex(ScanFillContext *sf_ctx, const int flag,
-                         const float nor_proj[3]);
+void BLI_scanfill_begin(ScanFillContext *sf_ctx);
+int  BLI_scanfill_calc(ScanFillContext *sf_ctx, const int flag);
+int  BLI_scanfill_calc_ex(ScanFillContext *sf_ctx, const int flag,
+                          const float nor_proj[3]);
 void BLI_scanfill_end(ScanFillContext *sf_ctx);
 
 /* These callbacks are needed to make the lib finction properly */
-
-/**
- * Set a function taking a (char *) as argument to flag errors. If the
- * callback is not set, the error is discarded.
- * \param f The function to use as callback
- * \attention used in creator.c
- */
 void BLI_setErrorCallBack(void (*f)(const char *));
-
-/**
- * Set a function to be able to interrupt the execution of processing
- * in this module. If the function returns true, the execution will
- * terminate gracefully. If the callback is not set, interruption is
- * not possible.
- * \param f The function to use as callback
- * \attention used in creator.c
- */
 void BLI_setInterruptCallBack(int (*f)(void));
 
 #ifdef __cplusplus
diff --git a/source/blender/blenlib/intern/scanfill.c b/source/blender/blenlib/intern/scanfill.c
index 4d42d71f490..feba2b2ce5f 100644
--- a/source/blender/blenlib/intern/scanfill.c
+++ b/source/blender/blenlib/intern/scanfill.c
@@ -47,11 +47,25 @@
 static void (*BLI_localErrorCallBack)(const char *) = NULL;
 static int (*BLI_localInterruptCallBack)(void) = NULL;
 
+/**
+ * Set a function taking a (char *) as argument to flag errors. If the
+ * callback is not set, the error is discarded.
+ * \param f The function to use as callback
+ * \attention used in creator.c
+ */
 void BLI_setErrorCallBack(void (*f)(const char *))
 {
 	BLI_localErrorCallBack = f;
 }
 
+/**
+ * Set a function to be able to interrupt the execution of processing
+ * in this module. If the function returns true, the execution will
+ * terminate gracefully. If the callback is not set, interruption is
+ * not possible.
+ * \param f The function to use as callback
+ * \attention used in creator.c
+ */
 void BLI_setInterruptCallBack(int (*f)(void))
 {
 	BLI_localInterruptCallBack = f;
@@ -826,11 +840,9 @@ static int scanfill(ScanFillContext *sf_ctx, PolyFill *pf, const int flag)
 }
 
 
-int BLI_scanfill_begin(ScanFillContext *sf_ctx)
+void BLI_scanfill_begin(ScanFillContext *sf_ctx)
 {
 	memset(sf_ctx, 0, sizeof(*sf_ctx));
-
-	return 1;
 }
 
 int BLI_scanfill_calc(ScanFillContext *sf_ctx, const int flag)