1.1 --- a/src/gtkui/gtkui.h	Mon May 12 10:00:13 2008 +0000
     1.2 +++ b/src/gtkui/gtkui.h	Mon Jul 14 07:44:42 2008 +0000
     1.3 @@ -16,8 +16,8 @@
     1.4   * GNU General Public License for more details.
     1.5   */
     1.6  
     1.7 -#ifndef __lxdream_gtkui_H
     1.8 -#define __lxdream_gtkui_H
     1.9 +#ifndef lxdream_gtkui_H
    1.10 +#define lxdream_gtkui_H 1
    1.11  
    1.12  #include "lxdream.h"
    1.13  #include <gtk/gtk.h>
    1.14 @@ -25,6 +25,10 @@
    1.15  #include "gui.h"
    1.16  #include "cpu.h"
    1.17  
    1.18 +#ifdef __cplusplus
    1.19 +extern "C" {
    1.20 +#endif
    1.21 +
    1.22  /********************* Top-level windows *********************/
    1.23  
    1.24  typedef struct main_window_info *main_window_t;
    1.25 @@ -37,7 +41,7 @@
    1.26   * opaque pointer to the window.
    1.27   */
    1.28  main_window_t main_window_new( const gchar *title, GtkWidget *menubar, 
    1.29 -			       GtkWidget *toolbar, GtkAccelGroup *accel );
    1.30 +                               GtkWidget *toolbar, GtkAccelGroup *accel );
    1.31  GtkWindow *main_window_get_frame( main_window_t win );
    1.32  GtkWidget *main_window_get_renderarea( main_window_t win );
    1.33  void main_window_set_running( main_window_t win, gboolean running );
    1.34 @@ -47,7 +51,7 @@
    1.35  void main_window_set_use_grab( main_window_t win, gboolean grab );
    1.36  
    1.37  debug_window_t debug_window_new( const gchar *title, GtkWidget *menubar,
    1.38 -				 GtkWidget *toolbar, GtkAccelGroup *accel );
    1.39 +                                 GtkWidget *toolbar, GtkAccelGroup *accel );
    1.40  void debug_window_show( debug_window_t win, gboolean show );
    1.41  void debug_window_set_running( debug_window_t win, gboolean running );
    1.42  void debug_window_update(debug_window_t win);
    1.43 @@ -82,7 +86,7 @@
    1.44  
    1.45  typedef gboolean (*file_callback_t)( const gchar *filename );
    1.46  void open_file_dialog( char *title, file_callback_t action, char *pattern, char *patname,
    1.47 -		       gchar const *initial_dir );
    1.48 +                       gchar const *initial_dir );
    1.49  /**
    1.50   * Extract the keyval of the key event if no modifier keys were pressed -
    1.51   * in other words get the keyval of the key by itself. The other way around
    1.52 @@ -155,4 +159,8 @@
    1.53  extern GdkColor gui_colour_trace, gui_colour_break, gui_colour_temp_break;
    1.54  extern GdkColor gui_colour_white;
    1.55  
    1.56 -#endif /* __lxdream_gtkui_H */
    1.57 +#ifdef __cplusplus
    1.58 +}
    1.59 +#endif
    1.60 +
    1.61 +#endif /* lxdream_gtkui_H */