X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/c71a0d48f3c880248a7f7f25e92ddbcbad5ef0e7..1dd4f26ab6c1f14628d9fcf03b0cca7e54d52302:/src/msdos.h

diff --git a/src/msdos.h b/src/msdos.h
index 3048b5f7e3..691822f312 100644
--- a/src/msdos.h
+++ b/src/msdos.h
@@ -1,5 +1,5 @@
 /* MS-DOS specific C utilities, interface.
-   Copyright (C) 1993, 2001-2011 Free Software Foundation, Inc.
+   Copyright (C) 1993, 2001-2016 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -41,9 +41,25 @@ void mouse_on (void);
 void mouse_off (void);
 void mouse_moveto (int, int);
 
+#include <sys/types.h>
+#include <sys/stat.h>
+
 #if __DJGPP__ == 2 && __DJGPP_MINOR__ < 4
 int readlink (const char *, char *, size_t);
 #endif
+ssize_t readlinkat (int, const char *, char *, size_t);
+int fstatat (int, char const *, struct stat *, int);
+int unsetenv (const char *);
+
+/* Constants.  */
+#define EINPROGRESS 112
+/* Gnulib sets O_CLOEXEC to O_NOINHERIT, which gets in the way when we
+   need to redirect standard handles for subprocesses using temporary
+   files created by mkostemp, see callproc.c.  */
+#ifdef O_CLOEXEC
+# undef O_CLOEXEC
+#endif
+#define O_CLOEXEC 0
 
 
 #ifndef HAVE_X_WINDOWS
@@ -63,7 +79,7 @@ extern struct tty_display_info the_only_display_info;
 
 #define FRAME_X_DISPLAY(f) ((Display *) 0)
 #define FRAME_FONT(f) ((f)->output_data.tty->font)
-#define FRAME_X_DISPLAY_INFO(f) (&the_only_display_info)
+#define FRAME_DISPLAY_INFO(f) (&the_only_display_info)
 
 /* Prototypes.  */
 
@@ -74,8 +90,6 @@ struct window;
 /* Defined in xfns.c; emulated on msdos.c */
 
 extern void x_set_menu_bar_lines (struct frame *, Lisp_Object, Lisp_Object);
-extern int x_pixel_width (struct frame *);
-extern int x_pixel_height (struct frame *);
 
 #define XFreeGC (void)
 #define x_destroy_bitmap(p1,p2)
@@ -85,7 +99,6 @@ extern int x_pixel_height (struct frame *);
 #define XMenuSetAEQ (void)
 #define XMenuSetFreeze (void)
 #define XMenuRecompute (void)
-#define FONT_WIDTH(foo) 1
 #define XM_FAILURE -1
 #define XM_SUCCESS 1
 #define XM_NO_SELECT 2