Warning cleanup

diff --git a/src/dir-util.cpp b/src/dir-util.cpp
index 75f7ca5247821166f8d57e1115839db8d7adc034..6beff22bf4c432cfdd5651455a4de48778b02b8e 100644 (file)
--- a/src/dir-util.cpp
+++ b/src/dir-util.cpp
@@ -208,8 +208,8 @@ inkscape_abs2rel (const char *path, const char *base, char *result, const size_t
   for (pp = path, bp = base; *pp && *bp && *pp == *bp; pp++, bp++)
     if (*pp == G_DIR_SEPARATOR)
       branch = pp;
-  if ((*pp == 0 || *pp == G_DIR_SEPARATOR && *(pp + 1) == 0) &&
-      (*bp == 0 || *bp == G_DIR_SEPARATOR && *(bp + 1) == 0))
+  if (((*pp == 0) || ((*pp == G_DIR_SEPARATOR) && (*(pp + 1) == 0))) &&
+      ((*bp == 0) || ((*bp == G_DIR_SEPARATOR) && (*(bp + 1) == 0))))
     {
       rp = result;
       *rp++ = '.';
@@ -220,7 +220,7 @@ inkscape_abs2rel (const char *path, const char *base, char *result, const size_t
       *rp = 0;
       goto finish;
     }
-  if (*pp == 0 && *bp == G_DIR_SEPARATOR || *pp == G_DIR_SEPARATOR && *bp == 0)
+  if (((*pp == 0) && (*bp == G_DIR_SEPARATOR)) || ((*pp == G_DIR_SEPARATOR) && (*bp == 0)))
     branch = pp;
   /* up to root. */
   rp = result;

diff --git a/src/ui/widget/object-composite-settings.cpp b/src/ui/widget/object-composite-settings.cpp
index ea1e8086db18c10380a6d0eb95768056578ed4dd..0ad7187f5f18d9cf27e172d7c90b428ba4e1c3eb 100644 (file)
--- a/src/ui/widget/object-composite-settings.cpp
+++ b/src/ui/widget/object-composite-settings.cpp
@@ -45,7 +45,7 @@ void ObjectCompositeSettings::_on_desktop_activate(
 
 void ObjectCompositeSettings::_on_desktop_deactivate(
     Inkscape::Application */*application*/,
-    SPDesktop *desktop,
+    SPDesktop */*desktop*/,
     ObjectCompositeSettings *w
 ) {
     if (w->_subject) {