diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2007-12-13 13:33:55 +0300 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2007-12-13 13:33:55 +0300 |
| commit | 5642c35aae2e3c26724dae929c13bf09e3344078 (patch) | |
| tree | 99e048d68ef6a7c72382e1e7f18ff592e47952ae | |
| parent | 1feea0bfd74d260dcd52618edec238808ada47ac (diff) | |
* string.h: Guard cygwin internal string function definitions with
__INSIDE_CYGWIN__.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/cygwin/string.h | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 6000c25c8..8f5116232 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +2007-12-13 Corinna Vinschen <corinna@vinschen.de> + + * string.h: Guard cygwin internal string function definitions with + __INSIDE_CYGWIN__. + 2007-12-12 Corinna Vinschen <corinna@vinschen.de> * dcrt0.cc: Include string.h. diff --git a/winsup/cygwin/string.h b/winsup/cygwin/string.h index ee831191e..cb870646e 100644 --- a/winsup/cygwin/string.h +++ b/winsup/cygwin/string.h @@ -59,6 +59,8 @@ strechr (const char *s, int c) return res; } +#ifdef __INSIDE_CYGWIN__ + /* Don't use. Not NLS aware. */ #if 0 // Not NLS aware extern const char isalpha_array[]; @@ -145,7 +147,10 @@ char * __stdcall cygwin_strlwr (char *); #define strupr cygwin_strupr char * __stdcall cygwin_strupr (char *); +#endif /* __INSIDE_CYGWIN__ */ + #ifdef __cplusplus } #endif + #endif /* _CYGWIN_STRING_H */ |