Add ifdef to avoid redefinition

Author: flanglet

src/Memory.hpp

@@ -22,11 +22,19 @@ limitations under the License.
 
 // Likely / unlikely macros
 #if defined(__GNUC__) || defined(__clang__)
-    #define LIKELY(x)   __builtin_expect(!!(x), 1)
-    #define UNLIKELY(x) __builtin_expect(!!(x), 0)
+    #ifndef LIKELY
+        #define LIKELY(x)   __builtin_expect(!!(x), 1)
+    #endif
+    #ifndef UNLIKELY
+        #define UNLIKELY(x) __builtin_expect(!!(x), 0)
+    #endif
 #else
-    #define LIKELY(x)   (x)
-    #define UNLIKELY(x) (x)
+    #ifndef LIKELY
+        #define LIKELY(x)   (x)
+    #endif
+    #ifndef UNLIKELY
+        #define UNLIKELY(x) (x)
+    #endif
 #endif
 
 namespace kanzi {

src/app/BlockDecompressor.cpp

@@ -627,7 +627,6 @@ T FileDecompressTask<T>::run()
     }
 
     Clock stopClock;
-    static const int DEFAULT_BUFFER_SIZE = 65536;
     byte* buf = new byte[DEFAULT_BUFFER_SIZE];
 
     try {

src/app/BlockDecompressor.hpp

@@ -91,6 +91,8 @@ namespace kanzi {
    template <class T>
    class FileDecompressTask FINAL : public Task<T> {
    public:
+       static const int DEFAULT_BUFFER_SIZE = 65536;
+
        FileDecompressTask(const Context& ctx, std::vector<Listener<Event>*>& listeners);
 
        ~FileDecompressTask();