diff options
author | Nicolas Pierron <nicolas.b.pierron@gmail.com> | 2014-03-02 14:11:35 -0300 |
---|---|---|
committer | Thiago de Arruda <tpadilha84@gmail.com> | 2014-03-02 14:19:59 -0300 |
commit | d9283c4927cc5f926fa796acc2568610bd9a80d6 (patch) | |
tree | ee22db97987af38c538d1bd6501a384203579949 /src/os_unix.c | |
parent | 2bd6d444033b5746595713f4d037de135379a23e (diff) | |
download | rneovim-d9283c4927cc5f926fa796acc2568610bd9a80d6.tar.gz rneovim-d9283c4927cc5f926fa796acc2568610bd9a80d6.tar.bz2 rneovim-d9283c4927cc5f926fa796acc2568610bd9a80d6.zip |
Remove __ARGS macro. Close #205
This is a squash of all commits sent to #81.
- Remove unused undef of __ARGS.
- Fix mch_rename declaration.
- Follow changes related to moved & extracted files.
- Properly indent function declarations of getchar.h and quickfix.c.
Diffstat (limited to 'src/os_unix.c')
-rw-r--r-- | src/os_unix.c | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/src/os_unix.c b/src/os_unix.c index d80ef00f5e..4456a1110f 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -62,7 +62,7 @@ static int selinux_enabled = -1; #if defined(HAVE_SELECT) -extern int select __ARGS((int, fd_set *, fd_set *, fd_set *, struct timeval *)); +extern int select(int, fd_set *, fd_set *, fd_set *, struct timeval *); #endif @@ -87,49 +87,49 @@ extern int select __ARGS((int, fd_set *, fd_set *, fd_set *, struct timeval *)); #endif -static int get_x11_title __ARGS((int)); -static int get_x11_icon __ARGS((int)); +static int get_x11_title(int); +static int get_x11_icon(int); static char_u *oldtitle = NULL; static int did_set_title = FALSE; static char_u *oldicon = NULL; static int did_set_icon = FALSE; -static void may_core_dump __ARGS((void)); +static void may_core_dump(void); #ifdef HAVE_UNION_WAIT typedef union wait waitstatus; #else typedef int waitstatus; #endif -static pid_t wait4pid __ARGS((pid_t, waitstatus *)); +static pid_t wait4pid(pid_t, waitstatus *); -static int WaitForChar __ARGS((long)); -static int RealWaitForChar __ARGS((int, long, int *)); +static int WaitForChar(long); +static int RealWaitForChar(int, long, int *); -static void handle_resize __ARGS((void)); +static void handle_resize(void); #if defined(SIGWINCH) -static RETSIGTYPE sig_winch __ARGS(SIGPROTOARG); +static RETSIGTYPE sig_winch SIGPROTOARG; #endif #if defined(SIGINT) -static RETSIGTYPE catch_sigint __ARGS(SIGPROTOARG); +static RETSIGTYPE catch_sigint SIGPROTOARG; #endif #if defined(SIGPWR) -static RETSIGTYPE catch_sigpwr __ARGS(SIGPROTOARG); +static RETSIGTYPE catch_sigpwr SIGPROTOARG; #endif -static RETSIGTYPE deathtrap __ARGS(SIGPROTOARG); +static RETSIGTYPE deathtrap SIGPROTOARG; -static void catch_int_signal __ARGS((void)); -static void set_signals __ARGS((void)); -static void catch_signals __ARGS( - (RETSIGTYPE (*func_deadly)(), RETSIGTYPE (*func_other)())); -static int have_wildcard __ARGS((int, char_u **)); -static int have_dollars __ARGS((int, char_u **)); +static void catch_int_signal(void); +static void set_signals(void); +static void catch_signals + (RETSIGTYPE (*func_deadly)(), RETSIGTYPE (*func_other)()); +static int have_wildcard(int, char_u **); +static int have_dollars(int, char_u **); -static int save_patterns __ARGS((int num_pat, char_u **pat, int *num_file, - char_u ***file)); +static int save_patterns(int num_pat, char_u **pat, int *num_file, + char_u ***file); #ifndef SIG_ERR # define SIG_ERR ((RETSIGTYPE (*)())-1) @@ -408,7 +408,7 @@ void mch_delay(long msec, int ignoreinput) * Return a pointer to an item on the stack. Used to find out if the stack * grows up or down. */ -static void check_stack_growth __ARGS((char *p)); +static void check_stack_growth(char *p); static int stack_grows_downwards; /* @@ -515,7 +515,7 @@ static stack_t sigstk; /* for sigaltstack() */ static struct sigstack sigstk; /* for sigstack() */ # endif -static void init_signal_stack __ARGS((void)); +static void init_signal_stack(void); static char *signal_stack; static void init_signal_stack() { @@ -765,7 +765,7 @@ deathtrap SIGDEFARG(sigarg) { * volatile because it is used in signal handler sigcont_handler(). */ static volatile int sigcont_received; -static RETSIGTYPE sigcont_handler __ARGS(SIGPROTOARG); +static RETSIGTYPE sigcont_handler SIGPROTOARG; /* * signal handler for SIGCONT @@ -1445,7 +1445,7 @@ int mch_isdir(char_u *name) #endif } -static int executable_file __ARGS((char_u *name)); +static int executable_file(char_u *name); /* * Return 1 if "name" is an executable file, 0 if not or it doesn't exist. @@ -1566,7 +1566,7 @@ void mch_free_mem() { #endif -static void exit_scroll __ARGS((void)); +static void exit_scroll(void); /* * Output a newline when exiting. @@ -3556,10 +3556,10 @@ const char *src, *dest; #if defined(FEAT_LIBCALL) || defined(PROTO) -typedef char_u * (*STRPROCSTR) __ARGS ((char_u *)); -typedef char_u * (*INTPROCSTR) __ARGS ((int)); -typedef int (*STRPROCINT) __ARGS ((char_u *)); -typedef int (*INTPROCINT) __ARGS ((int)); +typedef char_u * (*STRPROCSTR)(char_u *); +typedef char_u * (*INTPROCSTR)(int); +typedef int (*STRPROCINT)(char_u *); +typedef int (*INTPROCINT)(int); /* * Call a DLL routine which takes either a string or int param |