X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/4ffd0d6b569d252e4e807d4e9c9d6a5bd5b08640..9654230233e49cf93e6a8f38685e4b809f02789e:/src/msdos.h

diff --git a/src/msdos.h b/src/msdos.h
index 5051f2f383..27090324b4 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-2013 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -29,7 +29,7 @@ void dos_set_window_size (int *, int *);
 
 int getdefdir (int, char*);
 void unixtodos_filename (char *);
-void dostounix_filename (char *);
+void dostounix_filename (char *, int);
 char *rootrelativepath (char *);
 void init_environment (int, char **, int);
 void internal_terminal_init (void);
@@ -63,7 +63,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 +74,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)
@@ -101,16 +99,16 @@ typedef struct x_menu_struct
   int allocated;
   int panecount;
   int width;
-  char **help_text;
+  const char **help_text;
 } XMenu;
 
 XMenu *XMenuCreate (Display *, Window, char *);
-int XMenuAddPane (Display *, XMenu *, const char *, int);
-int XMenuAddSelection (Display *, XMenu *, int, int, char *, int, char *);
+int XMenuAddPane (Display *, XMenu *, char const *, int);
+int XMenuAddSelection (Display *, XMenu *, int, int, char *, int, char const *);
 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 *, int, int));
+		   char **, void (*callback)(char const *, int, int));
 void XMenuDestroy (Display *, XMenu *);
 
 #endif /* not HAVE_X_WINDOWS */