CVS: winex/include basetsd.h, 1.7, 1.8 shtypes.idl, NONE, 1.1

Subject: winex/include basetsd.h,1.7,1.8 shtypes.idl,NONE,1.1Update of /var/lib/cvsd/cvsroot/winex/include
In directory agravaine:/tmp/cvs-serv12667/include

Modified Files:
	basetsd.h 
Added Files:
	shtypes.idl 
Log Message:
Fix incorrect merges to get tree building again


Index: basetsd.h
===================================================================
RCS file: /var/lib/cvsd/cvsroot/winex/include/basetsd.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- basetsd.h	30 Mar 2007 21:29:00 -0000	1.7
+++ basetsd.h	16 Dec 2007 21:54:32 -0000	1.8
@@ -6,6 +6,7 @@
 #ifndef __WINE_BASETSD_H
 #define __WINE_BASETSD_H
 
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* defined(__cplusplus) */
@@ -31,7 +32,7 @@
 # define WORDS_LITTLEENDIAN
 # undef  BITFIELDS_BIGENDIAN
 # undef  ALLOW_UNALIGNED_ACCESS
-#elif !defined(RC_INVOKED)
+#elif !defined(RC_INVOKED) && !defined(__WIDL__)
 # error Unknown CPU architecture!
 #endif
 

--- NEW FILE: shtypes.idl ---