aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-08-01 12:15:29 +0200
committerFredrik Gustafsson <[email protected]>2013-08-01 12:15:29 +0200
commit9bca214dd7c1c5eb2b3058b2a9be08fe46bb62a4 (patch)
tree6c0bf70d53937ba98a3cdf15de9e76e5d91312a9
parent838b27839761949359bd3bf9932a1e5ff302ca4b (diff)
parent6bd5f710d75bb740b91e6c08cd3b08e68519c9d3 (diff)
downloadotp-9bca214dd7c1c5eb2b3058b2a9be08fe46bb62a4.tar.gz
otp-9bca214dd7c1c5eb2b3058b2a9be08fe46bb62a4.tar.bz2
otp-9bca214dd7c1c5eb2b3058b2a9be08fe46bb62a4.zip
Merge branch 'maint'
-rw-r--r--lib/os_mon/c_src/ferrule.c2
-rw-r--r--lib/os_mon/c_src/mod_syslog.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/os_mon/c_src/ferrule.c b/lib/os_mon/c_src/ferrule.c
index 744f302b2d..c55f594f34 100644
--- a/lib/os_mon/c_src/ferrule.c
+++ b/lib/os_mon/c_src/ferrule.c
@@ -50,7 +50,7 @@
#define FDS_STDIN 0
#define FDS_PIPE 1
-main(int argc, char *argv[])
+int main(int argc, char *argv[])
/* usage: ferrule ownpath */
{
int i, pipe_fd;
diff --git a/lib/os_mon/c_src/mod_syslog.c b/lib/os_mon/c_src/mod_syslog.c
index 87fbfbac22..b1bbf80b2a 100644
--- a/lib/os_mon/c_src/mod_syslog.c
+++ b/lib/os_mon/c_src/mod_syslog.c
@@ -47,7 +47,7 @@
#define TRUE 1
#define WAIT 1
-main(int argc, char *argv[])
+int main(int argc, char *argv[])
/* usage: mod_syslog mode ownpath syslogconf */
{
int syslogd_pid, n_lines_copied=0;
@@ -128,6 +128,7 @@ main(int argc, char *argv[])
make_exit(PIPE_NOT_FOUND);
else */
make_exit(OK);
+ return 0;
}
void make_exit(int exit_code)