aboutsummaryrefslogtreecommitdiff
path: root/winsup/cygwin/winsup.h
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2012-07-12 11:27:28 +0000
committerCorinna Vinschen <corinna@vinschen.de>2012-07-12 11:27:28 +0000
commit6902b88b0b628d76fd5997ff138247c23a903064 (patch)
tree0242d3d1eddb576af51bad51b51e3b1ecc82e89f /winsup/cygwin/winsup.h
parent568e72f5615151ca372f469780b09006023f13af (diff)
downloadnewlib-6902b88b0b628d76fd5997ff138247c23a903064.zip
newlib-6902b88b0b628d76fd5997ff138247c23a903064.tar.gz
newlib-6902b88b0b628d76fd5997ff138247c23a903064.tar.bz2
* winlean.h: Make sure certain Windows macros are undefined again.
Add comment to explain why. * winsup.h: Include winlean.h from C sources as well. * libc/minires-os-if.c: Drop including ntdef.h. Fix previous ChangeLog entry.
Diffstat (limited to 'winsup/cygwin/winsup.h')
-rw-r--r--winsup/cygwin/winsup.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/winsup/cygwin/winsup.h b/winsup/cygwin/winsup.h
index 0c96113..63495b8 100644
--- a/winsup/cygwin/winsup.h
+++ b/winsup/cygwin/winsup.h
@@ -81,8 +81,12 @@ int fcntl64 (int fd, int cmd, ...);
#define __WIDE(a) L ## a
#define _WIDE(a) __WIDE(a)
+#include "winlean.h"
+
#ifdef __cplusplus
+#include "wincap.h"
+
extern const char case_folded_lower[];
#define cyg_tolower(c) (case_folded_lower[(unsigned char)(c)])
extern const char case_folded_upper[];
@@ -92,9 +96,6 @@ extern const char case_folded_upper[];
#define cfree newlib_cfree_dont_use
#endif
-#include "winlean.h"
-#include "wincap.h"
-
/* Used as type by sys_wcstombs_alloc and sys_mbstowcs_alloc. For a
description see there. */
#define HEAP_NOTHEAP -1