stdcxx-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From far...@apache.org
Subject svn commit: r697875 - in /stdcxx/branches/4.2.x/util: ctype.cpp localedef.cpp path.cpp
Date Mon, 22 Sep 2008 16:00:11 GMT
Author: faridz
Date: Mon Sep 22 09:00:10 2008
New Revision: 697875

URL: http://svn.apache.org/viewvc?rev=697875&view=rev
Log:
2008-09-22  Farid Zaripov  <faridz@apache.org>

	STDCXX-455
	* util/ctype.cpp (process_ctype): Don't create symlink on Cygwin.
	(write_ctype): Same.
	* util/localedef.cpp (create_locale): Same.
	* util/path.cpp (create_symlink): Don't define function on Cygwin.

Modified:
    stdcxx/branches/4.2.x/util/ctype.cpp
    stdcxx/branches/4.2.x/util/localedef.cpp
    stdcxx/branches/4.2.x/util/path.cpp

Modified: stdcxx/branches/4.2.x/util/ctype.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/util/ctype.cpp?rev=697875&r1=697874&r2=697875&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/util/ctype.cpp (original)
+++ stdcxx/branches/4.2.x/util/ctype.cpp Mon Sep 22 09:00:10 2008
@@ -690,7 +690,7 @@
             if (next.token != Scanner::tok_string)
                 issue_diag (E_SYNTAX, true, &next,
                             "expected string following \"copy\" directive\n"); 
-#ifndef _WIN32
+#if !defined (_WIN32) && !defined (__CYGWIN32__)
 
             ctype_symlink_ = true;
 
@@ -712,7 +712,7 @@
                 continue;
             }
 
-#endif  // _WIN32
+#endif  // !_WIN32 && !__CYGWIN32__
 
             // bump up the nesting level
             nesting_level++;
@@ -891,7 +891,7 @@
     
     }
 
-#ifndef _WIN32
+#if !defined (_WIN32) && !defined (__CYGWIN32__)
     
     if (ctype_symlink_) {
 
@@ -909,6 +909,6 @@
         return;
     }
 
-#endif  // _WIN32
+#endif  // !_WIN32 && !__CYGWIN32__
 
 }

Modified: stdcxx/branches/4.2.x/util/localedef.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/util/localedef.cpp?rev=697875&r1=697874&r2=697875&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/util/localedef.cpp (original)
+++ stdcxx/branches/4.2.x/util/localedef.cpp Mon Sep 22 09:00:10 2008
@@ -267,7 +267,7 @@
     if (C_locales.empty ())
         return;
 
-#if !defined (_WIN32)
+#if !defined (_WIN32) && !defined (__CYGWIN32__)
 
     if (link_aliases == false)
         return;
@@ -283,7 +283,7 @@
         // pointing to our locale database
         create_symlink (outdir, std_locale, *it);
     }
-#endif  // _WIN32
+#endif  // !_WIN32 && !__CYGWIN32__
 }
 
 

Modified: stdcxx/branches/4.2.x/util/path.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/util/path.cpp?rev=697875&r1=697874&r2=697875&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/util/path.cpp (original)
+++ stdcxx/branches/4.2.x/util/path.cpp Mon Sep 22 09:00:10 2008
@@ -69,7 +69,7 @@
 }
 
 
-#ifndef _WIN32
+#if !defined (_WIN32) && !defined (__CYGWIN32__)
 
 void
 create_symlink (const std::string &dir, 
@@ -112,7 +112,7 @@
     }
 }
 
-#endif  // _WIN32
+#endif  // !_WIN32 && !__CYGWIN32__
 
 
 inline int



Mime
View raw message