* main.h: Don't check if panel.h was included. Use forward

declaration of WPanel, change prototypes to use struct WPanel.
(midnight_callback): Make static.
This commit is contained in:
Pavel Roskin 2002-11-13 08:32:49 +00:00
parent 1b017c668f
commit 85075934f1
3 changed files with 10 additions and 15 deletions

View File

@ -1,5 +1,9 @@
2002-11-13 Pavel Roskin <proski@gnu.org>
* main.h: Don't check if panel.h was included. Use forward
declaration of WPanel, change prototypes to use struct WPanel.
(midnight_callback): Make static.
* cmd.c (do_view_cmd): Don't take WPanel argument - always use
the current panel.
(view_cmd): Likewise.

View File

@ -685,7 +685,7 @@ subshell_chdir (char *directory)
}
void
directory_history_add (WPanel *panel, char *s)
directory_history_add (struct WPanel *panel, char *s)
{
if (!panel->dir_history) {
panel->dir_history = g_new0 (Hist, 1);
@ -793,7 +793,7 @@ _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)
do_panel_cd (struct WPanel *panel, char *new_dir, enum cd_enum cd_type)
{
int r;
@ -1691,7 +1691,7 @@ make_panels_dirty (void)
# define check_key_backslash(x) ((x) == '\\')
#endif
int
static int
midnight_callback (struct Dlg_head *h, int id, int msg)
{
int i;

View File

@ -175,17 +175,8 @@ void exec_shell (void);
# define MC_BASE "/.mc/"
#endif /* !NATIVE_WIN32 */
/* Back hack to define the following routines only if the client code
* has included panel.h
*/
#ifdef __PANEL_H
#ifndef PANEL_DEFS_DONE
#define PANEL_DEFS_DONE
void directory_history_add (WPanel *panel, char *s);
int do_panel_cd (WPanel *panel, char *new_dir, enum cd_enum cd_type);
int midnight_callback (struct Dlg_head *h, int id, int msg);
#endif /* !PANEL_DEFS_DONE */
#endif /* __PANEL_H */
struct WPanel;
void directory_history_add (struct WPanel *panel, char *s);
int do_panel_cd (struct WPanel *panel, char *new_dir, enum cd_enum cd_type);
#endif /* !__MAIN_H */