X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Ffs%2Fpath.cpp;h=d68595bb55ee83588ce9ae7a535c9424cbbaabef;hp=0fe95d65df943a9f0b4b1b4bf006035a4e7dccee;hb=5a32939eb6e576c223e1be5f80226d9e628a2398;hpb=8e613903920ee006c2c84e1af5620d92fbfb8957

diff --git a/source/fs/path.cpp b/source/fs/path.cpp
index 0fe95d6..d68595b 100644
--- a/source/fs/path.cpp
+++ b/source/fs/path.cpp
@@ -7,7 +7,7 @@ using namespace std;
 
 namespace {
 
-#ifdef WIN32
+#ifdef _WIN32
 inline bool is_windows_drive(const std::string &p)
 { return (p.size()==2 && ((p[0]>='A' && p[0]<='Z') || (p[0]>='a' && p[0]<='z')) && p[1]==':'); }
 #endif
@@ -58,7 +58,7 @@ unsigned Path::size() const
 
 bool Path::is_absolute() const
 {
-#ifdef WIN32
+#ifdef _WIN32
 	if(is_windows_drive((*this)[0]))
 		return true;
 #endif
@@ -103,7 +103,7 @@ void Path::add_component(const string &comp)
 	if(comp.size()==1 && (comp[0]=='/' || comp[0]=='\\'))
 	{
 		// Replace the path with the root directory
-#ifdef WIN32
+#ifdef _WIN32
 		string::size_type slash = (separators.empty() ? string::npos : separators.front());
 		if(is_windows_drive(path.substr(0, slash)))
 		{
@@ -118,7 +118,7 @@ void Path::add_component(const string &comp)
 			separators.push_back(0);
 		}
 	}
-#ifdef WIN32
+#ifdef _WIN32
 	else if(is_windows_drive(comp))
 	{
 		path = comp;
@@ -132,7 +132,7 @@ void Path::add_component(const string &comp)
 		// .. in root directory is a no-op
 		else if(path.size()==1 && path[0]==DIRSEP)
 			;
-#ifdef WIN32
+#ifdef _WIN32
 		else if(is_windows_drive(path))
 			;
 #endif
@@ -192,7 +192,7 @@ string Path::operator[](int n) const
 
 bool Path::operator==(const Path &other) const
 {
-#ifdef WIN32
+#ifdef _WIN32
 	return strcasecmp(path, other.path)==0;
 #else
 	return path==other.path;
@@ -201,7 +201,7 @@ bool Path::operator==(const Path &other) const
 
 bool Path::operator<(const Path &other) const
 {
-#ifdef WIN32
+#ifdef _WIN32
 	return strcasecmp(path, other.path)<0;
 #else
 	return path<other.path;
@@ -210,7 +210,7 @@ bool Path::operator<(const Path &other) const
 
 bool Path::operator>(const Path &other) const
 {
-#ifdef WIN32
+#ifdef _WIN32
 	return strcasecmp(path, other.path)>0;
 #else
 	return path>other.path;