(main): Fix typo in conversion of LONG_OPTIONS from

[gnu-emacs] / lib-src / ntlib.h

diff --git a/lib-src/ntlib.h b/lib-src/ntlib.h
index 39df4d03fd42a965333745d50b5f491fc361319f..523e3d6fd49b13172a952abd4bc5d037dfc471c8 100644 (file)
--- a/lib-src/ntlib.h
+++ b/lib-src/ntlib.h
@@ -13,16 +13,26 @@
    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, 675 Mass Ave, Cambridge, MA 02139, USA.
+   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.
 
 */
 
 #include <pwd.h>
 #include <malloc.h>
 
-void sleep(int seconds);
+/* Include these headers now so we don't have to worry about include
+   order dependencies in common source files.  */
+#include <direct.h>
+#include <io.h>
+#include <stdio.h>
+
+#ifdef sleep
+#undef sleep
+#endif
+void sleep(unsigned long seconds);
 char *getwd (char *dir);
 int getppid(void);
 char * getlogin ();
@@ -37,9 +47,73 @@ int fchown (int fd, int uid, int gid);
 #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)
-
-#define index   strchr
-#define rindex  strrchr
 #endif
 
+/* redirect or undo interceptions created by config.h */
+#undef access
+#define access  _access
+#undef chdir
+#define chdir   _chdir
+#undef chmod
+#define chmod   _chmod
+#undef close
+#define close   _close
+#undef creat
+#define creat   _creat
+#undef ctime
+#undef dup
+#define dup     _dup
+#undef dup2
+#define dup2    _dup2
+#undef fopen
+#undef mkdir
+#define mkdir   _mkdir
+#undef mktemp
+#define mktemp  _mktemp
+#undef open
+#define open    _open
+#undef pipe
+#define pipe    _pipe
+#undef read
+#define read    _read
+#undef rename
+#undef rmdir
+#define rmdir   _rmdir
+#undef unlink
+#define unlink  _unlink
+#undef write
+#define write   _write
+
+/* map to MSVC names */
+#define execlp    _execlp
+#define execvp    _execvp
+#define fcloseall _fcloseall
+#define fdopen   _fdopen
+#define fgetchar  _fgetchar
+#define fileno   _fileno
+#define flushall  _flushall
+#define fputchar  _fputchar
+#define getcwd   _getcwd
+#define getw     _getw
+#define getpid    _getpid
+#define isatty    _isatty
+#define locking   _locking
+#define logb      _logb
+#define _longjmp  longjmp
+#define lseek     _lseek
+#define popen     _popen
+#define pclose    _pclose
+#define putw     _putw
+#define umask    _umask
+#define utime    _utime
+#define index     strchr
+#define rindex    strrchr
+
+/* Make standard winsock definitions available if needed.  */
+#undef _WINSOCKAPI_
+#undef _WINSOCK_H
+
 /* end of ntlib.h */
+
+/* arch-tag: 93444f66-7b98-4aa5-a5cd-01444094af28
+   (do not change this comment) */