Author: matt
Date: 2012-08-16 14:49:00 -0700 (Thu, 16 Aug 2012)
New Revision: 9671
Log:
STR 2858: include statements were wrong

Modified:
   branches/branch-3.0/src/fltk3/utf8.cxx

Modified: branches/branch-3.0/src/fltk3/utf8.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/utf8.cxx      2012-08-16 21:48:25 UTC (rev 
9670)
+++ branches/branch-3.0/src/fltk3/utf8.cxx      2012-08-16 21:49:00 UTC (rev 
9671)
@@ -30,26 +30,29 @@
 #include <fltk3/filename.h>
 #include <stdarg.h>
 
-#if defined(WIN32) && !defined(__CYGWIN__)
+
+#if defined(WIN32) || defined(__CYGWIN__)
 # include <ctype.h>
 # include <io.h>
 # include <windows.h>
 # include <winbase.h>
 # include <process.h>
-#ifdef __CYGWIN__
-#include  <wchar.h>
-#else
-#include  <direct.h>
-#endif
+# ifdef __CYGWIN__
+#  include  <wchar.h>
+#  include <sys/types.h>
+#  include <sys/stat.h>
+#  include <fcntl.h>
+#  include <unistd.h>
+# else
+#  include  <direct.h>
+# endif
 extern "C" {
   int XUtf8Tolower(int ucs);
   unsigned short XUtf8IsNonSpacing(unsigned int ucs);
 };
-
 #elif defined(__APPLE__)
 # include <stdio.h>
 # include <time.h>
-//# include <unix.h>
 # include <fcntl.h>
 # include <unistd.h>
 # include <wchar.h>

_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit

Reply via email to