summaryrefslogtreecommitdiffstats
path: root/runtime
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-04-02 15:37:17 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-04-02 15:37:17 +0200
commit8de35eaa2c9017df885dfd071a89288ca6a0e3af (patch)
treec6cb185d912c5fa91a3dbd1a549618a251401078 /runtime
parenteb807027af9e126a212b0630c5873dddae48963b (diff)
downloadrsyslog-8de35eaa2c9017df885dfd071a89288ca6a0e3af.tar.gz
rsyslog-8de35eaa2c9017df885dfd071a89288ca6a0e3af.tar.xz
rsyslog-8de35eaa2c9017df885dfd071a89288ca6a0e3af.zip
clean compile on solaris
Diffstat (limited to 'runtime')
-rw-r--r--runtime/cfsysline.c4
-rw-r--r--runtime/rsyslog.h5
2 files changed, 7 insertions, 2 deletions
diff --git a/runtime/cfsysline.c b/runtime/cfsysline.c
index c4490b48..e1e4a6a4 100644
--- a/runtime/cfsysline.c
+++ b/runtime/cfsysline.c
@@ -364,7 +364,7 @@ static rsRetVal doGetGID(uchar **pp, rsRetVal (*pSetHdlr)(void*, uid_t), void *p
/* we set value via a set function */
CHKiRet(pSetHdlr(pVal, pgBuf->gr_gid));
}
- dbgprintf("gid %d obtained for group '%s'\n", pgBuf->gr_gid, szName);
+ dbgprintf("gid %d obtained for group '%s'\n", (int) pgBuf->gr_gid, szName);
}
skipWhiteSpace(pp); /* skip over any whitespace */
@@ -406,7 +406,7 @@ static rsRetVal doGetUID(uchar **pp, rsRetVal (*pSetHdlr)(void*, uid_t), void *p
/* we set value via a set function */
CHKiRet(pSetHdlr(pVal, ppwBuf->pw_uid));
}
- dbgprintf("uid %d obtained for user '%s'\n", ppwBuf->pw_uid, szName);
+ dbgprintf("uid %d obtained for user '%s'\n", (int) ppwBuf->pw_uid, szName);
}
skipWhiteSpace(pp); /* skip over any whitespace */
diff --git a/runtime/rsyslog.h b/runtime/rsyslog.h
index 899f5e13..032d8c04 100644
--- a/runtime/rsyslog.h
+++ b/runtime/rsyslog.h
@@ -341,6 +341,11 @@ typedef enum rsObjectID rsObjID;
# define __attribute__(x) /*NOTHING*/
#endif
+#ifndef O_CLOEXEC
+/* of course, this limits the functionality... */
+# define O_CLOEXEC 0
+#endif
+
/* The following prototype is convenient, even though it may not be the 100% correct place.. -- rgerhards 2008-01-07 */
void dbgprintf(char *, ...) __attribute__((format(printf, 1, 2)));