aboutsummaryrefslogtreecommitdiff
path: root/winsup
diff options
context:
space:
mode:
Diffstat (limited to 'winsup')
-rw-r--r--winsup/cygwin/ChangeLog18
-rw-r--r--winsup/cygwin/assert.cc2
-rw-r--r--winsup/cygwin/dtable.cc1
-rw-r--r--winsup/cygwin/fhandler_console.cc2
-rw-r--r--winsup/cygwin/fhandler_windows.cc2
-rw-r--r--winsup/cygwin/select.cc2
-rw-r--r--winsup/cygwin/spawn.cc2
-rw-r--r--winsup/cygwin/strace.cc2
-rw-r--r--winsup/cygwin/syscalls.cc1
-rw-r--r--winsup/cygwin/testsuite/winsup.api/crlf.c2
-rw-r--r--winsup/cygwin/testsuite/winsup.api/winsup.exp2
-rw-r--r--winsup/cygwin/tty.cc2
-rw-r--r--winsup/cygwin/uinfo.cc1
-rw-r--r--winsup/cygwin/window.cc2
-rw-r--r--winsup/cygwin/winsup.h16
-rw-r--r--winsup/testsuite/winsup.api/crlf.c2
-rw-r--r--winsup/testsuite/winsup.api/winsup.exp2
-rw-r--r--winsup/w32api/ChangeLog4
-rw-r--r--winsup/w32api/include/windows.h14
19 files changed, 75 insertions, 4 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index fec3580..168b923 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,21 @@
+2000-07-27 DJ Delorie <dj@redhat.com>
+
+ * testsuite/winsup.api/winsup.exp: ignore stdout by default
+ * testsuite/winsup.api/crlf.c: non-verbose by default
+
+ * winsup.h: prune out windows headers we don't normally need
+ * assert.cc: add wingdi.h and winuser.h
+ * fhandler_console.cc: ditto
+ * fhandler_windows.cc: ditto
+ * select.cc: ditto
+ * spawn.cc: ditto
+ * strace.cc: ditto
+ * tty.cc: ditto
+ * window.cc: ditto
+ * hinfo.cc: add winsock.h
+ * syscalls.cc: add winnls.h
+ * uinfo.cc: ditto
+
Thu Jul 27 10:24:36 2000 Egor Duda <deo@logos-m.ru>
* fhandler.cc (fhandler_disk_file::fstat): Allow block calculation to
diff --git a/winsup/cygwin/assert.cc b/winsup/cygwin/assert.cc
index fd1f383..c66418b 100644
--- a/winsup/cygwin/assert.cc
+++ b/winsup/cygwin/assert.cc
@@ -9,6 +9,8 @@ Cygwin license. Please consult the file "CYGWIN_LICENSE" for
details. */
#include "winsup.h"
+#include <wingdi.h>
+#include <winuser.h>
#include <assert.h>
#include <stdlib.h>
diff --git a/winsup/cygwin/dtable.cc b/winsup/cygwin/dtable.cc
index 4fb488d..8f8b14a 100644
--- a/winsup/cygwin/dtable.cc
+++ b/winsup/cygwin/dtable.cc
@@ -19,6 +19,7 @@ details. */
#define Win32_Winsock
#include "winsup.h"
+#include <winsock.h>
hinfo dtable;
diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc
index 8a4ad30..bd58c3a 100644
--- a/winsup/cygwin/fhandler_console.cc
+++ b/winsup/cygwin/fhandler_console.cc
@@ -19,6 +19,8 @@ details. */
#include <errno.h>
#include <unistd.h>
#include "winsup.h"
+#include <wingdi.h>
+#include <winuser.h>
#include <ctype.h>
/*
diff --git a/winsup/cygwin/fhandler_windows.cc b/winsup/cygwin/fhandler_windows.cc
index eee8286..b68bb70 100644
--- a/winsup/cygwin/fhandler_windows.cc
+++ b/winsup/cygwin/fhandler_windows.cc
@@ -13,6 +13,8 @@ details. */
#include <errno.h>
#include "winsup.h"
+#include <wingdi.h>
+#include <winuser.h>
/*
The following unix-style calls are supported:
diff --git a/winsup/cygwin/select.cc b/winsup/cygwin/select.cc
index d3c607a..bc2dce5 100644
--- a/winsup/cygwin/select.cc
+++ b/winsup/cygwin/select.cc
@@ -26,6 +26,8 @@ details. */
#include <sys/time.h>
#include "winsup.h"
+#include <wingdi.h>
+#include <winuser.h>
#include <netdb.h>
#include <unistd.h>
#include <stdio.h>
diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc
index c12882c..f237486 100644
--- a/winsup/cygwin/spawn.cc
+++ b/winsup/cygwin/spawn.cc
@@ -16,6 +16,8 @@ details. */
#include <errno.h>
#include <limits.h>
#include "winsup.h"
+#include <wingdi.h>
+#include <winuser.h>
#include <ctype.h>
#include "paths.h"
diff --git a/winsup/cygwin/strace.cc b/winsup/cygwin/strace.cc
index 1fadd0d..c6656f9 100644
--- a/winsup/cygwin/strace.cc
+++ b/winsup/cygwin/strace.cc
@@ -11,6 +11,8 @@ details. */
#include <stdlib.h>
#include <time.h>
#include "winsup.h"
+#include <wingdi.h>
+#include <winuser.h>
#define PROTECT(x) x[sizeof(x)-1] = 0
#define CHECK(x) if (x[sizeof(x)-1] != 0) { small_printf("array bound exceeded %d\n", __LINE__); ExitProcess(1); }
diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc
index 881a173..6123a47 100644
--- a/winsup/cygwin/syscalls.cc
+++ b/winsup/cygwin/syscalls.cc
@@ -21,6 +21,7 @@ details. */
#include <errno.h>
#include <limits.h>
#include "winsup.h"
+#include <winnls.h>
#include <lmcons.h> /* for UNLEN */
#include <unistd.h>
diff --git a/winsup/cygwin/testsuite/winsup.api/crlf.c b/winsup/cygwin/testsuite/winsup.api/crlf.c
index 2022234..5dbc222 100644
--- a/winsup/cygwin/testsuite/winsup.api/crlf.c
+++ b/winsup/cygwin/testsuite/winsup.api/crlf.c
@@ -237,7 +237,7 @@ get_bytestream(Buffer *buf)
char dataname[] = "crlf.dat";
-int verbose=1;
+int verbose=0;
void
v(char *fmt, ...)
{
diff --git a/winsup/cygwin/testsuite/winsup.api/winsup.exp b/winsup/cygwin/testsuite/winsup.api/winsup.exp
index 5c85cc0..96e7c7c 100644
--- a/winsup/cygwin/testsuite/winsup.api/winsup.exp
+++ b/winsup/cygwin/testsuite/winsup.api/winsup.exp
@@ -31,7 +31,7 @@ foreach src [glob -nocomplain $srcdir/$subdir/*.c $srcdir/$subdir/*/*.c] {
verbose -log "$rv"
fail "$testcase (compile)"
} else {
- ws_spawn "../cygrun ./$base.exe"
+ ws_spawn "../cygrun ./$base.exe > /dev/null"
if { $rv != "" } {
verbose -log "$testcase: $rv"
fail "$testcase (execute)"
diff --git a/winsup/cygwin/tty.cc b/winsup/cygwin/tty.cc
index d6aecfc..5a19958 100644
--- a/winsup/cygwin/tty.cc
+++ b/winsup/cygwin/tty.cc
@@ -12,6 +12,8 @@ details. */
#include <unistd.h>
#include <utmp.h>
#include "winsup.h"
+#include <wingdi.h>
+#include <winuser.h>
extern fhandler_tty_master *tty_master;
diff --git a/winsup/cygwin/uinfo.cc b/winsup/cygwin/uinfo.cc
index 8a19fce..5ee9162 100644
--- a/winsup/cygwin/uinfo.cc
+++ b/winsup/cygwin/uinfo.cc
@@ -10,6 +10,7 @@ details. */
#include <pwd.h>
#include "winsup.h"
+#include <winnls.h>
#include <utmp.h>
#include <limits.h>
#include <unistd.h>
diff --git a/winsup/cygwin/window.cc b/winsup/cygwin/window.cc
index ad7ac40..bd468d1 100644
--- a/winsup/cygwin/window.cc
+++ b/winsup/cygwin/window.cc
@@ -15,6 +15,8 @@ details. */
#include <errno.h>
#include <limits.h>
#include "winsup.h"
+#include <wingdi.h>
+#include <winuser.h>
static NO_COPY UINT timer_active = 0;
static NO_COPY struct itimerval itv;
diff --git a/winsup/cygwin/winsup.h b/winsup/cygwin/winsup.h
index cb4f5b8..35545ef 100644
--- a/winsup/cygwin/winsup.h
+++ b/winsup/cygwin/winsup.h
@@ -50,8 +50,24 @@ __asm__ __volatile__(
return __res;
}
+#define WIN32_LEAN_AND_MEAN 1
+#define _WINGDI_H
+#define _WINUSER_H
+#define _WINNLS_H
+#define _WINVER_H
+#define _WINNETWK_H
+#define _WINSVC_H
#include <windows.h>
#include <wincrypt.h>
+#undef _WINGDI_H
+#undef _WINUSER_H
+#undef _WINNLS_H
+#undef _WINVER_H
+#undef _WINNETWK_H
+#undef _WINSVC_H
+
+/* The one function we use from winuser.h most of the time */
+extern "C" DWORD WINAPI GetLastError (void);
/* Used for runtime OS check/decisions. */
enum os_type {winNT = 1, win95, win98, win32s, unknown};
diff --git a/winsup/testsuite/winsup.api/crlf.c b/winsup/testsuite/winsup.api/crlf.c
index 2022234..5dbc222 100644
--- a/winsup/testsuite/winsup.api/crlf.c
+++ b/winsup/testsuite/winsup.api/crlf.c
@@ -237,7 +237,7 @@ get_bytestream(Buffer *buf)
char dataname[] = "crlf.dat";
-int verbose=1;
+int verbose=0;
void
v(char *fmt, ...)
{
diff --git a/winsup/testsuite/winsup.api/winsup.exp b/winsup/testsuite/winsup.api/winsup.exp
index 5c85cc0..96e7c7c 100644
--- a/winsup/testsuite/winsup.api/winsup.exp
+++ b/winsup/testsuite/winsup.api/winsup.exp
@@ -31,7 +31,7 @@ foreach src [glob -nocomplain $srcdir/$subdir/*.c $srcdir/$subdir/*/*.c] {
verbose -log "$rv"
fail "$testcase (compile)"
} else {
- ws_spawn "../cygrun ./$base.exe"
+ ws_spawn "../cygrun ./$base.exe > /dev/null"
if { $rv != "" } {
verbose -log "$testcase: $rv"
fail "$testcase (execute)"
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index ca58c90..9385645 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,7 @@
+2000-07-27 DJ Delorie <dj@redhat.com>
+
+ * include/windows.h: optimize non-inclusion of repeat headers
+
2000-07-11 DJ Delorie <dj@cygnus.com>
* include/shlobj.h: add CSIDL_COMMON_*
diff --git a/winsup/w32api/include/windows.h b/winsup/w32api/include/windows.h
index 60cabfb..8fe9211 100644
--- a/winsup/w32api/include/windows.h
+++ b/winsup/w32api/include/windows.h
@@ -98,13 +98,27 @@
#include <basetyps.h>
#include <excpt.h>
#include <winbase.h>
+#ifndef _WINGDI_H
#include <wingdi.h>
+#endif
+#ifndef _WINUSER_H
#include <winuser.h>
+#endif
+#ifndef _WINNLS_H
#include <winnls.h>
+#endif
+#ifndef _WINVER_H
#include <winver.h>
+#endif
+#ifndef _WINNETWK_H
#include <winnetwk.h>
+#endif
+#ifndef _WINREG_H
#include <winreg.h>
+#endif
+#ifndef _WINSVC_H
#include <winsvc.h>
+#endif
#ifndef WIN32_LEAN_AND_MEAN
#include <commdlg.h>
generated by cgit v1.1 at 2025-02-07 16:56:11 +0000