Windows compilation 3/3

[cpPlugins.git] / lib / cpExtensions / Utility.h

diff --git a/lib/cpExtensions/Utility.h b/lib/cpExtensions/Utility.h
index e78b42064b63bce22b13f312a9dd8006da2f3cf7..28677864b915423b9e43931556b56780eae9b817 100644 (file)
--- a/lib/cpExtensions/Utility.h
+++ b/lib/cpExtensions/Utility.h
@@ -8,14 +8,13 @@
 #include <cpExtensions/Config.h>
 
 // -------------------------------------------------------------------------
-#ifdef cpPlugins_Windows
-#  define cpExtensions_STRTOK( A, B, N )  strtok_s(  A, B, N )
+#ifdef cpExtensions_OS_Windows
+#  define cpExtensions_STRTOK( A, B, N )  strtok_s( A, B, N )
 #  define cpExtensions_SPRINTF( B, S, O ) sprintf_s( B, S, "%s", O );
-#  define 
-#else // cpPlugins_Windows
+#else // cpExtensions_OS_Windows
 #  define cpExtensions_STRTOK( A, B, N )  std::strtok( A, B )
 #  define cpExtensions_SPRINTF( B, S, O ) std::sprintf( B, "%s", O );
-#endif // cpPlugins_Windows
+#endif // cpExtensions_OS_Windows
 
 // -------------------------------------------------------------------------
 #define cpExtensions_CHRONO                                             \
@@ -29,11 +28,11 @@ namespace cpExtensions
   // -----------------------------------------------------------------------
   inline bool IsPathSeparator( char c )
   {
-#ifdef cpPlugins_Windows
-    return( c == '\\' || c == cpExtensions_PATH_SEPARATOR );
-#else // cpPlugins_Windows
+#ifdef cpExtensions_OS_Windows
+    return( c == '/' || c == cpExtensions_PATH_SEPARATOR );
+#else // cpExtensions_OS_Windows
     return( c == cpExtensions_PATH_SEPARATOR );
-#endif // cpPlugins_Windows
+#endif // cpExtensions_OS_Windows
   }
 
   // -----------------------------------------------------------------------
@@ -113,12 +112,12 @@ namespace cpExtensions
   inline std::string CanonicalPath( const std::string& path )
   {
     std::string ret = "";
-#ifdef cpPlugins_Windows
+#ifdef cpExtensions_OS_Windows
     TCHAR  buffer[ 4096 ] = TEXT( "" );
     TCHAR** lppPart = { NULL };
     GetFullPathName( path.c_str( ), 4096, buffer, lppPart );
     ret = std::string( buffer );
-#else // cpPlugins_Windows
+#else // cpExtensions_OS_Windows
     char* canonical_path = realpath( path.c_str( ), NULL );
     if( canonical_path != NULL )
     {
@@ -126,7 +125,7 @@ namespace cpExtensions
       free( canonical_path );
 
     } // fi
-#endif // cpPlugins_Windows
+#endif // cpExtensions_OS_Windows
     return( ret );
   }