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.c b/lib-src/ntlib.c
index c24b35d9a19..0ecd4177d2c 100644
--- a/lib-src/ntlib.c
+++ b/lib-src/ntlib.c
@@ -1,6 +1,5 @@
 /* Utility and Unix shadow routines for GNU Emacs support programs on NT.
-   Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008, 2009, 2010  Free Software Foundation, Inc.
+   Copyright (C) 1994, 2001-2011  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -144,7 +143,7 @@ setuid (unsigned uid)
 }
 
 int
-setegid (unsigned gid)
+setregid (unsigned rgid, unsigned gid)
 {
   return 0;
 }
@@ -374,5 +373,3 @@ stat (const char * path, struct stat * buf)
   return 0;
 }
 
-/* arch-tag: 7b63fb83-70ee-4124-8822-54e53e5d0773
-   (do not change this comment) */