diff --git a/examples/flann_example.c b/examples/flann_example.c
index 2b6f7d7729395dfcb0deeb3c4ba11f78deed874f..501143d6c1c99ddc4e77ef1f50f0507542a84cf0 100644
--- a/examples/flann_example.c
+++ b/examples/flann_example.c
@@ -91,7 +91,7 @@ int main(int argc, char** argv)
     p = DEFAULT_FLANN_PARAMETERS;
     p.algorithm = KDTREE;
     p.trees = 8;
-    p.log_level = LOG_INFO;
+    p.log_level = FLANN_LOG_INFO;
 	p.checks = 64;
     
     printf("Computing index.\n");
diff --git a/src/cpp/flann/flann.cpp b/src/cpp/flann/flann.cpp
index 6a3535742a737a8b7f178e78f6869d6ab7feaad2..e15b8cc8a63c69f8ccfb3369718e1fb064190ca9 100644
--- a/src/cpp/flann/flann.cpp
+++ b/src/cpp/flann/flann.cpp
@@ -44,7 +44,7 @@ EXPORTED struct FLANNParameters DEFAULT_FLANN_PARAMETERS = {
     4, 4,
     32, 11, CENTERS_RANDOM, 
     0.9, 0.01, 0, 0.1, 
-    LOG_NONE, 0 
+    FLANN_LOG_NONE, 0 
 };
 
 
diff --git a/src/cpp/flann/general.h b/src/cpp/flann/general.h
index da5cf2f73c39ce9d1e0c8b759599d70e4c315155..4cdff809143e126ddcdf3cf81bc3fdf9dac75887 100644
--- a/src/cpp/flann/general.h
+++ b/src/cpp/flann/general.h
@@ -53,11 +53,11 @@ enum flann_centers_init_t {
 };
 
 enum flann_log_level_t {
-	LOG_NONE = 0,
-	LOG_FATAL = 1,
-	LOG_ERROR = 2,
-	LOG_WARN = 3,
-	LOG_INFO = 4
+	FLANN_LOG_NONE = 0,
+	FLANN_LOG_FATAL = 1,
+	FLANN_LOG_ERROR = 2,
+	FLANN_LOG_WARN = 3,
+	FLANN_LOG_INFO = 4
 };
 
 enum flann_distance_t {
diff --git a/src/cpp/flann/util/logger.cpp b/src/cpp/flann/util/logger.cpp
index 2f884649048887ebb2fbf5b1f1bf1aa526002332..23c049f0f0d0481bcedf380cd88b222da9fc5890 100644
--- a/src/cpp/flann/util/logger.cpp
+++ b/src/cpp/flann/util/logger.cpp
@@ -76,9 +76,9 @@ int Logger::log(int level, const char* fmt, va_list arglist)
     }
 
 
-LOG_METHOD(fatal, LOG_FATAL)
-LOG_METHOD(error, LOG_ERROR)
-LOG_METHOD(warn, LOG_WARN)
-LOG_METHOD(info, LOG_INFO)
+LOG_METHOD(fatal, FLANN_LOG_FATAL)
+LOG_METHOD(error, FLANN_LOG_ERROR)
+LOG_METHOD(warn, FLANN_LOG_WARN)
+LOG_METHOD(info, FLANN_LOG_INFO)
 
 }
diff --git a/src/cpp/flann/util/logger.h b/src/cpp/flann/util/logger.h
index 01f4f1edd9fb6fcbba249394dd23631ad5c02719..3af31b3c4a44e963a0fd660652ad70bed69de798 100644
--- a/src/cpp/flann/util/logger.h
+++ b/src/cpp/flann/util/logger.h
@@ -45,7 +45,7 @@ class Logger
 
 public:
 
-    Logger() : stream(stdout), logLevel(LOG_WARN) {};
+    Logger() : stream(stdout), logLevel(FLANN_LOG_WARN) {};
 
     ~Logger()
     {