* lisp/vc/diff-mode.el (diff-mode-shared-map): Bind g to revert-buffer.

[bpt/emacs.git] / lib-src / ntlib.h

diff --git a/lib-src/ntlib.h b/lib-src/ntlib.h
index e6bce58..4dd6a32 100644 (file)
--- a/lib-src/ntlib.h
+++ b/lib-src/ntlib.h
@@ -1,24 +1,22 @@
 /* Utility and Unix shadow routines for GNU Emacs support programs on NT.
-   Copyright (C) 1994 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2002, 2003, 2004, 2005, 2006, 2007,
+                 2008, 2009, 2010 Free Software Foundation, Inc.
 
-   This file is part of GNU Emacs.
+This file is part of GNU Emacs.
 
-   GNU Emacs is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2, or (at your option) any later
-   version.
+GNU Emacs is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
-   GNU Emacs is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-   more details.
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with GNU Emacs; see the file COPYING.  If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+You should have received a copy of the GNU General Public License
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-*/
 
 #include <pwd.h>
 #include <malloc.h>
@@ -32,22 +30,18 @@
 #ifdef sleep
 #undef sleep
 #endif
-void sleep(unsigned long seconds);
+void sleep (unsigned long seconds);
 char *getwd (char *dir);
-int getppid(void);
-char * getlogin ();
+int getppid (void);
+char * getlogin (void);
 char * cuserid (char * s);
-int getuid ();
-int setuid (int uid);
-struct passwd * getpwuid (int uid);
+unsigned getuid (void);
+unsigned getegid (void);
+unsigned getgid (void);
+int setuid (unsigned uid);
+int setegid (unsigned gid);
 char * getpass (const char * prompt);
-int fchown (int fd, int uid, int gid);
-
-#ifndef BSTRING
-#define bzero(b, l) memset(b, 0, l)
-#define bcopy(s, d, l) memcpy(d, s, l)
-#define bcmp(a, b, l) memcmp(a, b, l)
-#endif
+int fchown (int fd, unsigned uid, unsigned gid);
 
 /* redirect or undo interceptions created by config.h */
 #undef access
@@ -87,12 +81,10 @@ int fchown (int fd, int uid, int gid);
 /* map to MSVC names */
 #define execlp    _execlp
 #define execvp    _execvp
-#define fcloseall _fcloseall
 #define fdopen   _fdopen
-#define fgetchar  _fgetchar
+#ifndef fileno
 #define fileno   _fileno
-#define flushall  _flushall
-#define fputchar  _fputchar
+#endif
 #define getcwd   _getcwd
 #define getw     _getw
 #define getpid    _getpid
@@ -103,7 +95,6 @@ int fchown (int fd, int uid, int gid);
 #define lseek     _lseek
 #define popen     _popen
 #define pclose    _pclose
-#define putw     _putw
 #define umask    _umask
 #define utime    _utime
 #define index     strchr
@@ -114,3 +105,6 @@ int fchown (int fd, int uid, int gid);
 #undef _WINSOCK_H
 
 /* end of ntlib.h */
+
+/* arch-tag: 93444f66-7b98-4aa5-a5cd-01444094af28
+   (do not change this comment) */