* miscfuncs.cc (next_char): Fix typos in comment.

	* strfuncs.cc: Remove cygserver guards.

3 files changed, 7 insertions, 14 deletions

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index a5213a705..52d4212d8 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,5 +1,10 @@
 2008-02-06  Corinna Vinschen  <corinna@vinschen.de>
 
+	* miscfuncs.cc (next_char): Fix typos in comment.
+	* strfuncs.cc: Remove cygserver guards.
+
+2008-02-06  Corinna Vinschen  <corinna@vinschen.de>
+
 	* fhandler.h (fhandler_console::trunc_buf): Add to use as cache for
 	truncated multibyte characters on input.
 	(fhandler_console::write_replacement_char): Declare new method.
diff --git a/winsup/cygwin/miscfuncs.cc b/winsup/cygwin/miscfuncs.cc
index 4edfbab94..aa922d703 100644
--- a/winsup/cygwin/miscfuncs.cc
+++ b/winsup/cygwin/miscfuncs.cc
@@ -219,11 +219,11 @@ is_cp_multibyte (UINT cp)
    double byte charsets.  So we have to do it ourselves for UTF-8.
    
    While being at it, we do more.  If a double-byte or multibyte
-   sequence is trucated due to an early end, we need a way to recognize
+   sequence is truncated due to an early end, we need a way to recognize
    it.  The reason is that multiple buffered write statements might
    accidentally stop and start in the middle of a single character byte
    sequence.  If we have to interpret the byte sequences (as in
-   fhandler_console, we would print wrong output in these cases.
+   fhandler_console), we would print wrong output in these cases.
    
    So we have four possible return values here:
 
diff --git a/winsup/cygwin/strfuncs.cc b/winsup/cygwin/strfuncs.cc
index 23471d258..6b1250c3a 100644
--- a/winsup/cygwin/strfuncs.cc
+++ b/winsup/cygwin/strfuncs.cc
@@ -24,10 +24,6 @@ details. */
 codepage_type current_codepage = ansi_cp;
 UINT active_codepage = 0;
 
-#ifdef __OUTSIDE_CYGWIN__
-#define codepage_init(cp)	(active_codepage = GetACP ())
-#endif
-
 UINT
 get_cp ()
 {
@@ -73,14 +69,10 @@ sys_wcstombs_alloc (char **tgt_p, int type, const PWCHAR src, int slen)
     {
       size_t tlen = (slen == -1 ? ret : ret + 1);
 
-#ifndef __OUTSIDE_CYGWIN__
       if (type == HEAP_NOTHEAP)
-#endif
         *tgt_p = (char *) calloc (tlen, sizeof (char));
-#ifndef __OUTSIDE_CYGWIN__
       else
       	*tgt_p = (char *) ccalloc ((cygheap_types) type, tlen, sizeof (char));
-#endif
       if (!*tgt_p)
         return 0;
       ret = sys_wcstombs (*tgt_p, tlen, src, slen);
@@ -104,14 +96,10 @@ sys_mbstowcs_alloc (PWCHAR *tgt_p, int type, const char *src)
   ret = MultiByteToWideChar (get_cp (), 0, src, -1, NULL, 0);
   if (ret)
     {
-#ifndef __OUTSIDE_CYGWIN__
       if (type == HEAP_NOTHEAP)
-#endif
         *tgt_p = (PWCHAR) calloc (ret, sizeof (WCHAR));
-#ifndef __OUTSIDE_CYGWIN__
       else
       	*tgt_p = (PWCHAR) ccalloc ((cygheap_types) type, ret, sizeof (WCHAR));
-#endif
       if (!*tgt_p)
         return 0;
       ret = sys_mbstowcs (*tgt_p, src, ret);