Commented out WINDOWS preprocessor directives to compile.

Ashwinning · Apr 1, 2016 · b713744 · b713744
1 parent e3ad6df
commit b713744
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/Thirdparty/g2o/g2o/stuff/os_specific.c b/Thirdparty/g2o/g2o/stuff/os_specific.c
@@ -26,7 +26,7 @@
 
 #include "os_specific.h"
 
-#ifdef WINDOWS
+//#ifdef WINDOWS
 
 int vasprintf(char** strp, const char* fmt, va_list ap)
 {
@@ -61,4 +61,4 @@ int vasprintf(char** strp, const char* fmt, va_list ap)
 }
 
 
-#endif
+//#endif
diff --git a/Thirdparty/g2o/g2o/stuff/os_specific.h b/Thirdparty/g2o/g2o/stuff/os_specific.h
@@ -27,7 +27,7 @@
 #ifndef G2O_OS_SPECIFIC_HH_
 #define G2O_OS_SPECIFIC_HH_
 
-#ifdef WINDOWS
+//#ifdef WINDOWS
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -53,4 +53,4 @@ int vasprintf(char** strp, const char* fmt, va_list ap);
 // nothing to do on real operating systems
 #endif
 
-#endif
+//#endif
diff --git a/Thirdparty/g2o/g2o/stuff/string_tools.cpp b/Thirdparty/g2o/g2o/stuff/string_tools.cpp
@@ -25,7 +25,7 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "string_tools.h"
-#include "os_specific.h"
+
 #include "macros.h"
 
 #include <cctype>

diff --git a/Thirdparty/g2o/g2o/stuff/string_tools.h b/Thirdparty/g2o/g2o/stuff/string_tools.h
@@ -26,14 +26,15 @@
 
 #ifndef G2O_STRING_TOOLS_H
 #define G2O_STRING_TOOLS_H
-
+#include "os_specific.h"
 #include <string>
 #include <sstream>
 #include <cstdlib>
 #include <vector>
 
 #include "macros.h"
 
+
 namespace g2o {
 
 /** @addtogroup utils **/