Illumos fixes

- getexecname(3) returns const char *
- pid_t is long

diff --git a/ircd/ircd.c b/ircd/ircd.c
index 21b7605e255a9c076f997053654bd85a129bf87b..5751d20c292b0723a7ef6c8f5728f5811f1ad3a5 100644 (file)
--- a/ircd/ircd.c
+++ b/ircd/ircd.c
@@ -756,8 +756,8 @@ solanum_main(int argc, char * const argv[])
                check_splitmode_ev = rb_event_add("check_splitmode", check_splitmode, NULL, 5);
 
        if(server_state_foreground)
-               inotice("now running in foreground mode from %s as pid %d ...",
-                       ConfigFileEntry.dpath, getpid());
+               inotice("now running in foreground mode from %s as pid %ld ...",
+                       ConfigFileEntry.dpath, (long)getpid());
 
        rb_lib_loop(0);
 

diff --git a/librb/src/unix.c b/librb/src/unix.c
index 0f50a2fbee3628f8fd551baf3dd2aedaccd8bfd5..4d125d570136e3be07d691bba15afe1e0fb76de6 100644 (file)
--- a/librb/src/unix.c
+++ b/librb/src/unix.c
@@ -162,7 +162,7 @@ rb_path_to_self(void)
 {
        static char path_buf[4096];
 #if defined(HAVE_GETEXECNAME)
-       char *s = getexecname();
+       const char *s = getexecname();
        if (s == NULL)
                return NULL;
        realpath(s, path_buf);

diff --git a/modules/m_stats.c b/modules/m_stats.c
index 55489068680d4ed70ad4c774c7bdc8cc4a41b09f..790472b32f93d3f82b17630f301e0c3b853afec8 100644 (file)
--- a/modules/m_stats.c
+++ b/modules/m_stats.c
@@ -908,8 +908,8 @@ stats_ssld_foreach(void *data, pid_t pid, int cli_count, enum ssld_status status
        struct Client *source_p = data;
 
        sendto_one_numeric(source_p, RPL_STATSDEBUG,
-                       "S :%u %c %u :%s",
-                       pid,
+                       "S :%ld %c %u :%s",
+                       (long)pid,
                        status == SSLD_DEAD ? 'D' : (status == SSLD_SHUTDOWN ? 'S' : 'A'),
                        cli_count,
                        version);