Merge changes from emacs-23 branch.

[gnu-emacs] / src / w32.h

diff --git a/src/w32.h b/src/w32.h
index c57d8956411524a926d540d4f9e541403278e0d8..b4f0683a9c8bc3d529219336011e7461c8b6e03b 100644 (file)
--- a/src/w32.h
+++ b/src/w32.h
@@ -3,7 +3,7 @@
 
 /* Support routines for the NT version of Emacs.
    Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007, 2008  Free Software Foundation, Inc.
+                 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -72,6 +72,8 @@ typedef struct _child_process
   PROCESS_INFORMATION   procinfo;
   volatile int          status;
   char                  chr;
+  OVERLAPPED            ovl_read;
+  OVERLAPPED            ovl_write;
 } child_process;
 
 #define MAXDESC FD_SETSIZE
@@ -99,6 +101,7 @@ extern filedesc fd_info [ MAXDESC ];
 #define FILE_PIPE               0x0100
 #define FILE_SOCKET             0x0200
 #define FILE_NDELAY             0x0400
+#define FILE_SERIAL             0x0800
 
 extern child_process * new_child (void);
 extern void delete_child (child_process *cp);