Cygwin: __WORDSIZE: Drop 32 bit considerations

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>

winsup/cygwin/include/bits/wordsize.h

@@ -4,6 +4,5 @@
 #define _WORDSIZE_H 1
 
 # define __WORDSIZE     64
-# define __WORDSIZE_COMPAT32    1
 
 #endif /*_WORDSIZE_H*/

winsup/cygwin/include/cygwin/limits.h

@@ -39,13 +39,7 @@ details. */
    threads in the same allocation granularity slot.  Oh well. */
 #define __PTHREAD_STACK_MIN 65536
 
-/* FIXME: We only support one realtime signal in 32 bit mode, but
-	 _POSIX_RTSIG_MAX is 8. */
-#if __WORDSIZE == 64
 #define __RTSIG_MAX 33
-#else
-#define __RTSIG_MAX 1
-#endif
 #define __SEM_VALUE_MAX 1147483648
 #define __SIGQUEUE_MAX 32
 #define __STREAM_MAX 20

winsup/cygwin/include/cygwin/signal.h

@@ -383,11 +383,7 @@ struct sigaction
 #define	SIGUSR1 30	/* user defined signal 1 */
 #define	SIGUSR2 31	/* user defined signal 2 */
 
-#if __WORDSIZE == 64
 #define _NSIG	65      /* signal 0 implied */
-#else
-#define _NSIG	33      /* signal 0 implied */
-#endif
 
 #if __MISC_VISIBLE
 #define NSIG	_NSIG

winsup/cygwin/include/limits.h

@@ -90,11 +90,7 @@ details. */
 /* Minimum and maximum values a `signed long int' can hold.
    (Same as `int').  */
 #ifndef __LONG_MAX__
-#if __WORDSIZE == 64
 #define __LONG_MAX__ 9223372036854775807L
-#else
-#define __LONG_MAX__ 2147483647L
-# endif /* __alpha__ */
 #endif
 #undef LONG_MIN
 #define LONG_MIN (-LONG_MAX-1L)
@@ -135,16 +131,10 @@ details. */
 
 /* Maximum size of ssize_t. Sadly, gcc doesn't give us __SSIZE_MAX__
    the way it does for __SIZE_MAX__.  On the other hand, we happen to
-   know that for Cygwin, ssize_t is 'int' on 32-bit and 'long' on
-   64-bit, and this particular header is specific to Cygwin, so we
-   don't have to jump through hoops. */
+   know that for Cygwin, ssize_t is 'long' and this particular header
+   is specific to Cygwin, so we don't have to jump through hoops. */
 #undef SSIZE_MAX
-#if __WORDSIZE == 64
 #define SSIZE_MAX (__LONG_MAX__)
-#else
-#define SSIZE_MAX (__INT_MAX__)
-#endif
-
 
 /* Runtime Invariant Values */
 

winsup/cygwin/include/mapi.h

@@ -1,100 +0,0 @@
-/* mapi.h
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _MAPI_H
-#define _MAPI_H
-
-/* Currently this doesn't include all the definitions.  It does cover
-   the parts of Simple MAPI required to send mail.  */
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-  /* FIXME: should this be elsewhere?  */
-typedef unsigned long FLAGS;
-
-  /* FIXME: should this be elsewhere?  */
-#define SUCCESS_SUCCESS 0
-
-  /* FIXME: should this be elsewhere?  */
-typedef unsigned long LHANDLE, FAR *LPLHANDLE;
-
-
-#define MAPI_E_AMBIGUOUS_RECIPIENT 0x15
-#define MAPI_E_ATTACHMENT_NOT_FOUND 0xb
-#define MAPI_E_ATTACHMENT_OPEN_FAILURE 0xc
-#define MAPI_E_BAD_RECIPTYPE 0xf
-#define MAPI_E_FAILURE 0x2
-#define MAPI_E_INSUFFICIENT_MEMORY 0x5
-#define MAPI_E_INVALID_RECIPS 0x19
-#define MAPI_E_LOGIN_FAILURE 0x3
-#define MAPI_E_TEXT_TOO_LARGE 0x12
-#define MAPI_E_TOO_MANY_FILES 0x9
-#define MAPI_E_TOO_MANY_RECIPIENTS 0xa
-#define MAPI_E_UNKNOWN_RECIPIENT 0xe
-#define MAPI_E_USER_ABORT 0x1
-#define MAPI_E_TEXT_TOO_LARGE 0x12
-#define MAPI_DIALOG 0x8
-#define MAPI_NEW_SESSION 0x2
-#define MAPI_LOGON_UI 0x1
-#define MAPI_RECEIPT_REQUESTED 0x2
-#define MAPI_SENT 0x4
-#define MAPI_UNREAD 0x1
-#define MAPI_OLE 0x1
-#define MAPI_OLE_STATIC 0x2
-
-#define MAPI_ORIG 0
-#define MAPI_TO   1
-#define MAPI_CC   2
-#define MAPI_BCC  3
-
-typedef struct
-{
-  ULONG ulReserved;
-  ULONG flFlags;
-  ULONG nPosition;
-  LPTSTR lpszPathName;
-  LPTSTR lpszFileName;
-  LPVOID lpFileType;
-} MapiFileDesc, FAR *lpMapiFileDesc;
-
-typedef struct
-{
-  ULONG ulReserved;
-  ULONG ulRecipClass;
-  LPTSTR lpszName;
-  LPTSTR lpszAddress;
-  ULONG ulEIDSize;
-  LPVOID lpEntryID;
-} MapiRecipDesc, FAR *lpMapiRecipDesc;
-
-typedef struct
-{
-  ULONG ulReserved;
-  LPTSTR lpszSubject;
-  LPTSTR lpszNoteText;
-  LPTSTR lpszMessageType;
-  LPTSTR lpszDateReceived;
-  LPTSTR lpszConversationID;
-  FLAGS flFlags;
-  lpMapiRecipDesc lpOriginator;
-  ULONG nRecipCount;
-  lpMapiRecipDesc lpRecips;
-  ULONG nFileCount;
-  lpMapiFileDesc lpFiles;
-} MapiMessage, FAR *lpMapiMessage;
-
-ULONG FAR PASCAL MAPISendMail (LHANDLE, ULONG, lpMapiMessage, FLAGS, ULONG);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _MAPI_H */