Skip to content

Commit

Permalink
patch 7.4.1208
Browse files Browse the repository at this point in the history
Problem:    Using old style function declarations.
Solution:   Change to new style function declarations. (script by Hirohito
            Higashi)
  • Loading branch information
brammool committed Jan 30, 2016
1 parent 66f948e commit 68c2f63
Show file tree
Hide file tree
Showing 18 changed files with 687 additions and 981 deletions.
15 changes: 5 additions & 10 deletions src/gui_photon.c
Original file line number Diff line number Diff line change
Expand Up @@ -1111,9 +1111,7 @@ gui_ph_encoding_changed(int new_encoding)
/****************************************************************************/

void
gui_mch_prepare(argc, argv)
int *argc;
char **argv;
gui_mch_prepare(int *argc, char **argv)
{
PtInit(NULL);
}
Expand Down Expand Up @@ -1720,7 +1718,7 @@ gui_mch_iconify(void)
* Bring the Vim window to the foreground.
*/
void
gui_mch_set_foreground()
gui_mch_set_foreground(void)
{
PhWindowEvent_t event;

Expand Down Expand Up @@ -1860,8 +1858,7 @@ static int mshape_ids[] =
};

void
mch_set_mouse_shape(shape)
int shape;
mch_set_mouse_shape(int shape)
{
int id;

Expand Down Expand Up @@ -2184,7 +2181,7 @@ gui_mch_clear_block(int row1, int col1, int row2, int col2)
}

void
gui_mch_clear_all()
gui_mch_clear_all(void)
{
PhRect_t text_rect = {
{ gui.border_width, gui.border_width },
Expand Down Expand Up @@ -3078,9 +3075,7 @@ gui_mch_get_font(char_u *vim_font_name, int report_error)
* Don't know how to get the actual name, thus use the provided name.
*/
char_u *
gui_mch_get_fontname(font, name)
GuiFont font;
char_u *name;
gui_mch_get_fontname(GuiFont font, char_u *name)
{
if (name == NULL)
return NULL;
Expand Down
54 changes: 20 additions & 34 deletions src/gui_w32.c
Original file line number Diff line number Diff line change
Expand Up @@ -2246,7 +2246,7 @@ im_set_active(int active)
* Get IM status. When IM is on, return not 0. Else return 0.
*/
int
im_get_status()
im_get_status(void)
{
int status = 0;
HIMC hImc;
Expand Down Expand Up @@ -4525,10 +4525,7 @@ typedef struct _signicon_t
} signicon_t;

void
gui_mch_drawsign(row, col, typenr)
int row;
int col;
int typenr;
gui_mch_drawsign(int row, int col, int typenr)
{
signicon_t *sign;
int x, y, w, h;
Expand Down Expand Up @@ -4605,8 +4602,7 @@ close_signicon_image(signicon_t *sign)
}

void *
gui_mch_register_sign(signfile)
char_u *signfile;
gui_mch_register_sign(char_u *signfile)
{
signicon_t sign, *psign;
char_u *ext;
Expand Down Expand Up @@ -4661,8 +4657,7 @@ gui_mch_register_sign(signfile)
}

void
gui_mch_destroy_sign(sign)
void *sign;
gui_mch_destroy_sign(void *sign)
{
if (sign)
{
Expand Down Expand Up @@ -4766,10 +4761,7 @@ multiline_balloon_available(void)
}

static void
make_tooltip(beval, text, pt)
BalloonEval *beval;
char *text;
POINT pt;
make_tooltip(BalloonEval *beval, char *text, POINT pt)
{
TOOLINFO *pti;
int ToolInfoSize;
Expand Down Expand Up @@ -4833,19 +4825,18 @@ make_tooltip(beval, text, pt)
}

static void
delete_tooltip(beval)
BalloonEval *beval;
delete_tooltip(BalloonEval *beval)
{
PostMessage(beval->balloon, WM_CLOSE, 0, 0);
}

/*ARGSUSED*/
static VOID CALLBACK
BevalTimerProc(hwnd, uMsg, idEvent, dwTime)
HWND hwnd;
UINT uMsg;
UINT_PTR idEvent;
DWORD dwTime;
BevalTimerProc(
HWND hwnd,
UINT uMsg,
UINT_PTR idEvent,
DWORD dwTime)
{
POINT pt;
RECT rect;
Expand Down Expand Up @@ -4883,8 +4874,7 @@ BevalTimerProc(hwnd, uMsg, idEvent, dwTime)

/*ARGSUSED*/
void
gui_mch_disable_beval_area(beval)
BalloonEval *beval;
gui_mch_disable_beval_area(BalloonEval *beval)
{
// TRACE0("gui_mch_disable_beval_area {{{");
KillTimer(s_textArea, BevalTimerId);
Expand All @@ -4893,8 +4883,7 @@ gui_mch_disable_beval_area(beval)

/*ARGSUSED*/
void
gui_mch_enable_beval_area(beval)
BalloonEval *beval;
gui_mch_enable_beval_area(BalloonEval *beval)
{
// TRACE0("gui_mch_enable_beval_area |||");
if (beval == NULL)
Expand All @@ -4905,9 +4894,7 @@ gui_mch_enable_beval_area(beval)
}

void
gui_mch_post_balloon(beval, mesg)
BalloonEval *beval;
char_u *mesg;
gui_mch_post_balloon(BalloonEval *beval, char_u *mesg)
{
POINT pt;
// TRACE0("gui_mch_post_balloon {{{");
Expand All @@ -4928,11 +4915,11 @@ gui_mch_post_balloon(beval, mesg)

/*ARGSUSED*/
BalloonEval *
gui_mch_create_beval_area(target, mesg, mesgCB, clientData)
void *target; /* ignored, always use s_textArea */
char_u *mesg;
void (*mesgCB)(BalloonEval *, int);
void *clientData;
gui_mch_create_beval_area(
void *target, /* ignored, always use s_textArea */
char_u *mesg,
void (*mesgCB)(BalloonEval *, int),
void *clientData)
{
/* partially stolen from gui_beval.c */
BalloonEval *beval;
Expand Down Expand Up @@ -5010,8 +4997,7 @@ TrackUserActivity(UINT uMsg)
}

void
gui_mch_destroy_beval_area(beval)
BalloonEval *beval;
gui_mch_destroy_beval_area(BalloonEval *beval)
{
vim_free(beval);
}
Expand Down
15 changes: 6 additions & 9 deletions src/gui_w48.c
Original file line number Diff line number Diff line change
Expand Up @@ -1144,7 +1144,7 @@ gui_mch_new_colors(void)
* Set the colors to their default values.
*/
void
gui_mch_def_colors()
gui_mch_def_colors(void)
{
gui.norm_pixel = GetSysColor(COLOR_WINDOWTEXT);
gui.back_pixel = GetSysColor(COLOR_WINDOW);
Expand Down Expand Up @@ -1390,9 +1390,7 @@ gui_mch_get_font(
*/
/*ARGSUSED*/
char_u *
gui_mch_get_fontname(font, name)
GuiFont font;
char_u *name;
gui_mch_get_fontname(GuiFont font, char_u *name)
{
if (name == NULL)
return NULL;
Expand Down Expand Up @@ -2623,8 +2621,7 @@ gui_mch_update_tabline(void)
* Set the current tab to "nr". First tab is 1.
*/
void
gui_mch_set_curtab(nr)
int nr;
gui_mch_set_curtab(int nr)
{
if (s_tabhwnd == NULL)
return;
Expand Down Expand Up @@ -3258,7 +3255,7 @@ update_im_font(void)
* Handler of gui.wide_font (p_guifontwide) changed notification.
*/
void
gui_mch_wide_font_changed()
gui_mch_wide_font_changed(void)
{
# ifndef MSWIN16_FASTTEXT
LOGFONT lf;
Expand Down Expand Up @@ -3385,7 +3382,7 @@ gui_mch_init_font(char_u *font_name, int fontset)
* Return TRUE if the GUI window is maximized, filling the whole screen.
*/
int
gui_mch_maximized()
gui_mch_maximized(void)
{
WINDOWPLACEMENT wp;

Expand All @@ -3403,7 +3400,7 @@ gui_mch_maximized()
* new Rows and Columns. This is like resizing the window.
*/
void
gui_mch_newfont()
gui_mch_newfont(void)
{
RECT rect;

Expand Down
Loading

0 comments on commit 68c2f63

Please sign in to comment.