(Fmake_network_process): Only support server sockets

[gnu-emacs] / src / msdos.h

diff --git a/src/msdos.h b/src/msdos.h
index 76b133582da373d77b6f66aab2f8e7b045ec113b..a0e33a69fe504550189b24d8714d987a1167a904 100644 (file)
--- a/src/msdos.h
+++ b/src/msdos.h
@@ -1,5 +1,5 @@
 /* MS-DOS specific C utilities, interface.
-   Copyright (C) 1993 Free Software Foundation, Inc.
+   Copyright (C) 1993, 2001 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -18,8 +18,8 @@ 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.  */
 
-#ifndef _MSDOS_H_
-#define _MSDOS_H_
+#ifndef EMACS_MSDOS_H
+#define EMACS_MSDOS_H
 
 #include <dpmi.h>
 
@@ -80,6 +80,9 @@ struct display_info
 
   /* Nonzero means defer mouse-motion highlighting.  */
   int mouse_face_defer;
+
+  /* Nonzero means that the mouse highlight should not be shown.  */
+  int mouse_face_hidden;
 };
 
 /* This is a cut-down version of the one in xterm.h, which see.  */
@@ -91,8 +94,8 @@ struct x_output
   PIX_TYPE background_pixel;   /* used in xfaces.c and lots of other places */
   PIX_TYPE foreground_pixel;   /* ditto */
   XFontStruct *font;           /* used in x-popup-menu (xmenu.c) */
-  Window busy_window;          /* currently unused (but maybe some day) */
-  unsigned busy_p : 1;         /* ditto */
+  Window hourglass_window;     /* currently unused (but maybe some day) */
+  unsigned hourglass_p : 1;    /* ditto */
   struct display_info display_info; /* used for drawing mouse highlight */
 };
 
@@ -103,6 +106,7 @@ extern struct x_output the_only_x_display;
 #define FRAME_BACKGROUND_PIXEL(f) (the_only_x_display.background_pixel)
 #define FRAME_FONT(f) (the_only_x_display.font)
 #define FRAME_X_DISPLAY_INFO(f) (&the_only_x_display.display_info)
+#define FRAME_LINE_HEIGHT(f) (the_only_x_display.line_height)
 
 #define FRAME_INTERNAL_BORDER_WIDTH(f) (0)
 
@@ -161,9 +165,9 @@ int XMenuAddSelection (Display *, XMenu *, int, int, char *, int, char *);
 void XMenuLocate (Display *, XMenu *, int, int, int, int,
                  int *, int *, int *, int *);
 int XMenuActivate (Display *, XMenu *, int *, int *, int, int, unsigned,
-                  char **, void (*callback)(char *));
+                  char **, void (*callback)(char *, int, int));
 void XMenuDestroy (Display *, XMenu *);
 
 #endif /* not HAVE_X_WINDOWS */
 
-#endif /* not _MSDOS_H_ */
+#endif /* not EMACS_MSDOS_H */