(HAVE_INDEX, HAVE_RINDEX, HAVE_STRINGS_H): Add undefs.

[bpt/emacs.git] / src / msdos.h

diff --git a/src/msdos.h b/src/msdos.h
index 97253fc..a60bb3e 100644 (file)
--- a/src/msdos.h
+++ b/src/msdos.h
@@ -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>
 
@@ -104,6 +104,8 @@ extern struct x_output the_only_x_display;
 #define FRAME_FONT(f) (the_only_x_display.font)
 #define FRAME_X_DISPLAY_INFO(f) (&the_only_x_display.display_info)
 
+#define FRAME_INTERNAL_BORDER_WIDTH(f) (0)
+
 /* Prototypes.  */
 
 /* Forward declarations for prototypes.  */
@@ -150,16 +152,18 @@ typedef struct x_menu_struct
   int allocated;
   int panecount;
   int width;
+  char **help_text;
 } XMenu;
 
 XMenu *XMenuCreate (Display *, Window, char *);
 int XMenuAddPane (Display *, XMenu *, char *, int);
-int XMenuAddSelection (Display *, XMenu *, int, int, char *, int);
+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 **);
+int XMenuActivate (Display *, XMenu *, int *, int *, int, int, unsigned,
+                  char **, void (*callback)(char *, int, int));
 void XMenuDestroy (Display *, XMenu *);
 
 #endif /* not HAVE_X_WINDOWS */
 
-#endif /* not _MSDOS_H_ */
+#endif /* not EMACS_MSDOS_H */