mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-03 10:04:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

* main.h: Use "ifdef HAVE_GNOME", not "if HAVE_GNOME". Fix the

Browse Source 
order of conditionals and put comments on endifs.
This commit is contained in:
Pavel Roskin 2001-06-25 21:36:38 +00:00
parent 680f3f7ed2
commit 29adaeacbf
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
2001-06-25 Pavel Roskin <proski@gnu.org>
* main.h: Use "ifdef HAVE_GNOME", not "if HAVE_GNOME". Fix the
order of conditionals and put comments on endifs.
2001-06-25 Andrew V. Samoilov <sav@bcs.zp.ua> 2001-06-25 Andrew V. Samoilov <sav@bcs.zp.ua>
* view.c [HAVE_CHARSET]: Include selcodepage.h. * view.c [HAVE_CHARSET]: Include selcodepage.h.

17
src/main.h
View File

@ -74,7 +74,7 @@ extern int display_codepage;
#else #else
extern int eight_bit_clean; extern int eight_bit_clean;
extern int full_eight_bits; extern int full_eight_bits;
#endif #endif /* !HAVE_CHARSET */
extern int confirm_view_dir; extern int confirm_view_dir;
extern int fast_refresh; extern int fast_refresh;
@ -106,7 +106,7 @@ extern char search_buffer [256];
extern char cmd_buf [512]; extern char cmd_buf [512];
extern char *cmdline_geometry; extern char *cmdline_geometry;
#if HAVE_GNOME #ifdef HAVE_GNOME
#define MENU_PANEL get_current_panel () #define MENU_PANEL get_current_panel ()
#define SELECTED_IS_PANEL 1 #define SELECTED_IS_PANEL 1
#else #else
@ -114,7 +114,7 @@ extern char *cmdline_geometry;
extern int is_right; /* If the selected menu was the right */ extern int is_right; /* If the selected menu was the right */
#define MENU_PANEL (is_right ? right_panel : left_panel) #define MENU_PANEL (is_right ? right_panel : left_panel)
#define SELECTED_IS_PANEL (get_display_type (is_right ? 1 : 0) == view_listing) #define SELECTED_IS_PANEL (get_display_type (is_right ? 1 : 0) == view_listing)
#endif #endif /* !HAVE_GNOME */
/* Useful macros to avoid too much typing */ /* Useful macros to avoid too much typing */
#define cpanel get_current_panel() #define cpanel get_current_panel()
@ -186,7 +186,7 @@ extern WMenu *the_menubar;
extern Dlg_head *midnight_dlg; extern Dlg_head *midnight_dlg;
#endif #endif /* WANT_WIDGETS */
void edition_pre_exec (void); void edition_pre_exec (void);
void edition_post_exec (void); void edition_post_exec (void);
@ -199,8 +199,7 @@ void exec_shell (void);
# define MC_BASE "" # define MC_BASE ""
#else #else
# define MC_BASE "/.mc/" # define MC_BASE "/.mc/"
#endif #endif /* !OS2_NT */
#endif
/* Back hack to define the following routines only if the client code /* Back hack to define the following routines only if the client code
* has included panel.h * has included panel.h
@ -213,5 +212,7 @@ void directory_history_add (WPanel *panel, char *s);
int do_panel_cd (WPanel *panel, char *new_dir, enum cd_enum cd_type); int do_panel_cd (WPanel *panel, char *new_dir, enum cd_enum cd_type);
void update_one_panel_widget (WPanel *panel, int force_update, char *current_file); void update_one_panel_widget (WPanel *panel, int force_update, char *current_file);
int midnight_callback (struct Dlg_head *h, int id, int msg); int midnight_callback (struct Dlg_head *h, int id, int msg);
#endif #endif /* !PANEL_DEFS_DONE */
#endif #endif /* __PANEL_H */
#endif /* !__MAIN_H */