aports/main/eggdrop/fix-inline-functions.patch
2015-11-09 07:24:19 +00:00

71 lines
1.7 KiB
Diff

Description: fix inline functions to build with clang-3.5. See
http://clang.llvm.org/compatibility.html#inline
Author: Arthur Marble <arthur@info9.net>
--- a/src/match.c
+++ b/src/match.c
@@ -367,7 +367,7 @@
/* Inline for cron_match (obviously).
* Matches a single field of a crontab expression.
*/
-inline int cron_matchfld(char *mask, int match)
+static inline int cron_matchfld(char *mask, int match)
{
int skip = 0, f, t;
char *p, *q;
--- a/src/tclhash.c
+++ b/src/tclhash.c
@@ -109,7 +109,7 @@
nfree(tl);
}
-inline void garbage_collect_tclhash(void)
+void garbage_collect_tclhash(void)
{
tcl_bind_list_t *tl, *tl_next, *tl_prev;
tcl_bind_mask_t *tm, *tm_next, *tm_prev;
--- a/src/tclhash.h
+++ b/src/tclhash.h
@@ -75,7 +75,7 @@
#ifndef MAKING_MODS
-inline void garbage_collect_tclhash(void);
+void garbage_collect_tclhash(void);
void init_bind(void);
void kill_bind(void);
--- a/src/net.c
+++ b/src/net.c
@@ -564,7 +564,7 @@
/* Returns a socket number for a listening socket that will accept any
* connection -- port # is returned in port
*/
-inline int open_listen(int *port)
+int open_listen(int *port)
{
return open_address_listen(myip[0] ? getmyip() : INADDR_ANY, port);
}
--- a/src/proto.h
+++ b/src/proto.h
@@ -271,7 +271,7 @@
void killsock(int);
void killtclsock(int);
int answer(int, char *, unsigned long *, unsigned short *, int);
-inline int open_listen(int *);
+int open_listen(int *);
int open_address_listen(IP addr, int *);
int open_telnet(char *, int);
int open_telnet_dcc(int, char *, char *);
--- a/src/userrec.c
+++ b/src/userrec.c
@@ -77,7 +77,7 @@
#endif
}
-inline int expmem_mask(struct maskrec *m)
+static inline int expmem_mask(struct maskrec *m)
{
int result = 0;