X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/ff96b5f4494cad2294221ea54b6003081616ecc8..660872b63b75b61d11b09471b5a254e1e5db3c1c:/src/msdos.h

diff --git a/src/msdos.h b/src/msdos.h
index 038ec6aabe..dfb4a4c943 100644
--- 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>
 
@@ -91,8 +91,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 */
 };
 
@@ -161,9 +161,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 */