* cygserver_client.cc (client_request::handle_request): Correct

	tracing statement.
	* cygserver_transport_pipes.cc: Remove local definition of
	FILE_FLAG_FIRST_PIPE_INSTANCE constant.
	* cygwin_ipc.h: Update copyright notice.
	* cygwin_shm.h: Ditto.
	* woutsup.h: Add definition of _WIN32_WINNT.

6 files changed, 31 insertions, 19 deletions

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 1e1958f20..de19a76a3 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,13 @@
+2002-06-27  Conrad Scott  <conrad.scott@dsl.pipex.com>
+
+	* cygserver_client.cc (client_request::handle_request): Correct
+	tracing statement.
+	* cygserver_transport_pipes.cc: Remove local definition of
+	FILE_FLAG_FIRST_PIPE_INSTANCE constant.
+	* cygwin_ipc.h: Update copyright notice.
+	* cygwin_shm.h: Ditto.
+	* woutsup.h: Add definition of _WIN32_WINNT.
+
 2002-06-26  Christopher Faylor  <cgf@redhat.com>
 
 	* fhandler_disk_file.cc (fhandler_disk_file::fstat_by_name): Force
diff --git a/winsup/cygwin/cygserver_client.cc b/winsup/cygwin/cygserver_client.cc
index a99269c8f..723716e0c 100755
--- a/winsup/cygwin/cygserver_client.cc
+++ b/winsup/cygwin/cygserver_client.cc
@@ -254,8 +254,8 @@ client_request::send (transport_layer_base * const conn)
  */
 
 /* static */ void
-client_request::handle_request (transport_layer_base *conn,
-				class process_cache *cache)
+client_request::handle_request (transport_layer_base *const conn,
+				process_cache *const cache)
 {
   // verbose: debug_printf ("about to read");
 
@@ -273,9 +273,9 @@ client_request::handle_request (transport_layer_base *conn,
 			errno, GetLastError ());
 	return;
       }
-  }
 
-  // verbose: debug_printf ("got header (%ld)", bytes_read);
+      // verbose: debug_printf ("got header (%ld)", count);
+  }
 
   client_request *req = NULL;
 
@@ -390,8 +390,8 @@ client_request::make_request ()
  */
 
 void
-client_request::handle (transport_layer_base * const conn,
-			class process_cache * const cache)
+client_request::handle (transport_layer_base *const conn,
+			process_cache *const cache)
 {
   if (msglen () && !_buf)
     {
diff --git a/winsup/cygwin/cygserver_transport_pipes.cc b/winsup/cygwin/cygserver_transport_pipes.cc
index d256fd92a..a6a212971 100755
--- a/winsup/cygwin/cygserver_transport_pipes.cc
+++ b/winsup/cygwin/cygserver_transport_pipes.cc
@@ -38,13 +38,6 @@
 
 #ifndef __INSIDE_CYGWIN__
 
-// This flag is currently missing from w32api so it's here 'til I get
-// a patch sorted out.
-
-#ifndef FILE_FLAG_FIRST_PIPE_INSTANCE
-#define FILE_FLAG_FIRST_PIPE_INSTANCE 0x00080000
-#endif
-
 static pthread_once_t pipe_instance_lock_once = PTHREAD_ONCE_INIT;
 static CRITICAL_SECTION pipe_instance_lock;
 static long pipe_instance = 0;
diff --git a/winsup/cygwin/cygwin_ipc.h b/winsup/cygwin/cygwin_ipc.h
index f319aebeb..b9aa7c2e6 100755
--- a/winsup/cygwin/cygwin_ipc.h
+++ b/winsup/cygwin/cygwin_ipc.h
@@ -1,6 +1,6 @@
 /* sys/ipc.h
 
-   Copyright 2001 Red Hat Inc. 
+   Copyright 2001, 2002 Red Hat Inc. 
    Written by Robert Collins <rbtcollins@hotmail.com>
 
 This file is part of Cygwin.
diff --git a/winsup/cygwin/cygwin_shm.h b/winsup/cygwin/cygwin_shm.h
index 987de660e..fb3b4c8a7 100755
--- a/winsup/cygwin/cygwin_shm.h
+++ b/winsup/cygwin/cygwin_shm.h
@@ -1,6 +1,6 @@
 /* sys/shm.h
 
-   Copyright 2001 Red Hat Inc. 
+   Copyright 2001, 2002 Red Hat Inc. 
    Written by Robert Collins <rbtcollins@hotmail.com>
 
 This file is part of Cygwin.
diff --git a/winsup/cygwin/woutsup.h b/winsup/cygwin/woutsup.h
index 1e1d52c1d..9c153793c 100644
--- a/winsup/cygwin/woutsup.h
+++ b/winsup/cygwin/woutsup.h
@@ -2,11 +2,11 @@
 
    Copyright 2002 Red Hat, Inc.
 
-   This file is part of Cygwin.
+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. */
+This software is a copyrighted work licensed under the terms of the
+Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
+details. */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -16,6 +16,15 @@
 #error "woutsup.h is not for code being compiled inside the dll"
 #endif
 
+#ifndef _WIN32_WINNT
+#define _WIN32_WINNT 0x0500
+#endif
+
+#if _WIN32_WINNT < 0x0500
+#undef _WIN32_WINNT
+#define _WIN32_WINNT 0x0500
+#endif
+
 #define WIN32_LEAN_AND_MEAN 1
 #define _WINGDI_H
 #define _WINUSER_H