Merging from trunk

[inkscape.git] / src / dialogs / eek-color-def.cpp

diff --git a/src/dialogs/eek-color-def.cpp b/src/dialogs/eek-color-def.cpp
index 5a1a883e9f9a26b15bb7611f899adc15837dd688..9a079b68fe89010739873ed46f154cb7350d6b09 100644 (file)
--- a/src/dialogs/eek-color-def.cpp
+++ b/src/dialogs/eek-color-def.cpp
@@ -37,6 +37,8 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+#include "config.h"
+
 #ifdef HAVE_LIBINTL_H
 #include <libintl.h>
 #endif
@@ -127,7 +129,8 @@ void ColorDef::addCallback( ColorCallback cb, void* data )
 
 void ColorDef::removeCallback( ColorCallback cb, void* data )
 {
-
+    (void)cb;
+    (void)data;
 }