aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--winsup/cygwin/ChangeLog5
-rw-r--r--winsup/cygwin/Makefile.in5
-rw-r--r--winsup/cygwin/include/sys/cygwin.h4
3 files changed, 11 insertions, 3 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 49df1f0..f9cb891 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jun 22 17:50:59 2000 Christopher Faylor <cgf@cygnus.com>
+
+ * Makefile.in: Autogenerate cygwin.def when appropriate.
+ * include/sys/cygwin.h: Correct prototype.
+
Thu Jun 22 17:05:04 2000 Christopher Faylor <cgf@cygnus.com>
* include/sys/cygwin.h: Don't define parts of this file that rely on
diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in
index 4431bab..97f5687 100644
--- a/winsup/cygwin/Makefile.in
+++ b/winsup/cygwin/Makefile.in
@@ -165,7 +165,7 @@ install: all $(install_host) $(install_target)
install_host:
clean:
- -rm -f *.o *.dll *.a *.exp junk *.base *.def version.cc regexp/*.o winver_stamp *.exe
+ -rm -f *.o *.dll *.a *.exp junk *.base version.cc regexp/*.o winver_stamp *.exe
maintainer-clean realclean: clean
@echo "This command is intended for maintainers to use;"
@@ -269,6 +269,9 @@ check: testsuite/site.exp
Makefile: cygwin.din
+$(DEF_FILE): cygwin.din config.status
+ $(SHELL) config.status
+
# .h file dependencies
# This may be overkill, but it's better than the previous situation.
# As files/dependencies are added and removed from Cygwin, please keep
diff --git a/winsup/cygwin/include/sys/cygwin.h b/winsup/cygwin/include/sys/cygwin.h
index d9932ba..cd563ff 100644
--- a/winsup/cygwin/include/sys/cygwin.h
+++ b/winsup/cygwin/include/sys/cygwin.h
@@ -41,8 +41,8 @@ extern HANDLE cygwin_logon_user (const struct passwd *, const char *);
extern void cygwin_set_impersonation_token (const HANDLE);
/* included if <windows.h> is included */
-extern int cygwin32_attach_handle_to_fd (char *, int, HANDLE, int, int);
-extern int cygwin_attach_handle_to_fd (char *, int, HANDLE, mode_t, unsigned);
+extern int cygwin32_attach_handle_to_fd (char *, int, HANDLE, mode_t, DWORD);
+extern int cygwin_attach_handle_to_fd (char *, int, HANDLE, mode_t, DWORD);
#include <sys/resource.h>