merge from upstream. currently seems to have bitroted and i get segfaults

1 files changed, 2 insertions, 5 deletions

diff --git a/lib-src/ntlib.h b/lib-src/ntlib.h
index 4dd6a32ee32..be8d2a58a50 100644
--- a/lib-src/ntlib.h
+++ b/lib-src/ntlib.h
@@ -1,6 +1,5 @@
 /* Utility and Unix shadow routines for GNU Emacs support programs on NT.
-   Copyright (C) 1994, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2002-2011 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -39,7 +38,7 @@ unsigned getuid (void);
 unsigned getegid (void);
 unsigned getgid (void);
 int setuid (unsigned uid);
-int setegid (unsigned gid);
+int setregid (unsigned rgid, unsigned gid);
 char * getpass (const char * prompt);
 int fchown (int fd, unsigned uid, unsigned gid);
 
@@ -106,5 +105,3 @@ int fchown (int fd, unsigned uid, unsigned gid);
 
 /* end of ntlib.h */
 
-/* arch-tag: 93444f66-7b98-4aa5-a5cd-01444094af28
-   (do not change this comment) */