From: Petr Bena <benapetr@gmail.com>
Date: Mon, 21 Sep 2015 12:19:33 +0000 (+0200)
Subject: Clean up
X-Git-Tag: 0.12.3~39
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=464c6d26b82c25d78834383e3dc8996ec4544ba9;ds=sidebyside

Clean up

Removed extra semicolon and resolved some compiler warnings
---

diff --git a/3rdparty/miniz/miniz.c b/3rdparty/miniz/miniz.c
index ee0ac995..4805823d 100644
--- a/3rdparty/miniz/miniz.c
+++ b/3rdparty/miniz/miniz.c
@@ -750,11 +750,11 @@ typedef struct
   mz_int16 m_look_up[TINFL_FAST_LOOKUP_SIZE], m_tree[TINFL_MAX_HUFF_SYMBOLS_0 * 2];
 } tinfl_huff_table;
 
-#if MINIZ_HAS_64BIT_REGISTERS
+#if defined MINIZ_HAS_64BIT_REGISTERS && MINIZ_HAS_64BIT_REGISTERS
   #define TINFL_USE_64BIT_BITBUF 1
 #endif
 
-#if TINFL_USE_64BIT_BITBUF
+#if defined TINFL_USE_64BIT_BITBUF && TINFL_USE_64BIT_BITBUF
   typedef mz_uint64 tinfl_bit_buf_t;
   #define TINFL_BITBUF_SIZE (64)
 #else
diff --git a/src/common/syncableobject.h b/src/common/syncableobject.h
index 08bd2e30..1275cc32 100644
--- a/src/common/syncableobject.h
+++ b/src/common/syncableobject.h
@@ -76,7 +76,7 @@ public:
 
     virtual bool isInitialized() const;
 
-    virtual const QMetaObject *syncMetaObject() const { return metaObject(); };
+    virtual const QMetaObject *syncMetaObject() const { return metaObject(); }
 
     inline void setAllowClientUpdates(bool allow) { _allowClientUpdates = allow; }
     inline bool allowClientUpdates() const { return _allowClientUpdates; }