diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-08-01 12:15:20 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-08-01 12:15:20 +0200 |
| commit | 6bd5f710d75bb740b91e6c08cd3b08e68519c9d3 (patch) | |
| tree | 6735a71ede246b5828b62c21ea8795496e94d20e | |
| parent | 9d285af5c34a340e20c1e57860257429bff320cc (diff) | |
| parent | 483a8a37e9e6f5a82417adcaf7db55a2283f87bb (diff) | |
| download | otp-6bd5f710d75bb740b91e6c08cd3b08e68519c9d3.tar.gz otp-6bd5f710d75bb740b91e6c08cd3b08e68519c9d3.tar.bz2 otp-6bd5f710d75bb740b91e6c08cd3b08e68519c9d3.zip | |
Merge branch 'mmalecki/fix-solaris/OTP-11213' into maint
* mmalecki/fix-solaris/OTP-11213:
Fix compilation on Solaris
| -rw-r--r-- | lib/os_mon/c_src/ferrule.c | 2 | ||||
| -rw-r--r-- | lib/os_mon/c_src/mod_syslog.c | 3 |
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) |