Changeset 30593 for lang/cplusplus

Timestamp:

02/27/09 20:39:44 (4 years ago)

Author:

saturday06

Message:

guha....................

Location:

lang/cplusplus/i3/trunk

Files:

• Makefile.am (modified) (2 diffs)
• src/mol/include/mol/os-windows/PrecompiledHeaders.h (modified) (2 diffs)

lang/cplusplus/i3/trunk/Makefile.am

@@ -57 +57 @@
 include am/i3_test_debug.am
 include am/mol_test_debug.am
+include am/fakecygpty.am
 
 if ENABLE_DEBUG
@@ -69 +70 @@
         cd ${top_distdir} && sh ${abs_top_srcdir}/scripts/clean_distdir.sh
 
-if WITH_CYGWIN
-# fakecygpty.exe
-include am/fakecygpty.am
-endif
-
 # copy locale file for windows
 windows-locale:

lang/cplusplus/i3/trunk/src/mol/include/mol/os-windows/PrecompiledHeaders.h

@@ -12 +12 @@
 #include <windows.h>
 #define BOOL WINBOOL
-#elif !defined(__CYGWIN__)
+#endif
+
+#ifdef __CYGWIN__
+#ifndef _T
+#define _T TEXT
+#endif
+#else
 #include <winsock2.h>
-#include <windows.h>
+#include <tchar.h>
 #endif
 
@@ -28 +34 @@
 #include <uxtheme.h>
 
-#ifdef __CYGWIN__
-#ifndef _T
-#define _T TEXT
-#endif
-#else
-#include <tchar.h>
-#endif
-
 #ifndef __GNUC__
 #include <pdh.h>