Changeset 21299 for trunk/include/win/windef.h

Timestamp:

Jun 16, 2009, 3:08:41 PM (16 years ago)

Author:

ydario

Message:

Header updates.

File:

• trunk/include/win/windef.h (modified) (4 diffs)

trunk/include/win/windef.h

@@ -151 +151 @@
 #endif
 
-
+#ifndef __EMX__
 #if (__IBMC__ < 400) && (__IBMCPP__ < 360)
 #ifndef __declspec
@@ -165 +165 @@
 #endif
 #endif // (__IBMC__ < 400) && (__IBMCPP__ < 360)
+#endif // __EMX__
 
 #ifndef CONST
@@ -309 +310 @@
 typedef double          __int64;
 #elif defined (__EMX__)
+#ifndef _JAVASOFT_JNI_MD_H_
 typedef long long       __int64;
+#endif
 #endif
 #else
@@ -532 +535 @@
 #define __TEXT(string) L##string /*probably wrong */
 # else  /* UNICODE */
-typedef CHAR TCHAR;
+typedef CHAR            TCHAR,      *PTCHAR;
 typedef LPSTR LPTSTR;
 typedef LPCSTR LPCTSTR;