diff options
| author | Colin Walters <walters@verbum.org> | 2008-12-19 18:54:59 -0500 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2009-01-06 17:38:32 -0500 |
| commit | 4e4f0de8cc8c3127641013fd833349dab34b676b (patch) | |
| tree | 3e0d7a903a0411eda4759eb7a7fc49babbd6efd8 /dbus | |
| parent | eb1ba381f62ae0defc9b0cfaa3a228f2c6a3d623 (diff) | |
Various compiler warning fixes
Diffstat (limited to 'dbus')
| -rw-r--r-- | dbus/dbus-marshal-basic.c | 2 | ||||
| -rw-r--r-- | dbus/dbus-spawn.c | 4 | ||||
| -rw-r--r-- | dbus/dbus-sysdeps-util-unix.c | 1 | ||||
| -rw-r--r-- | dbus/dbus-sysdeps.c | 4 |
4 files changed, 6 insertions, 5 deletions
diff --git a/dbus/dbus-marshal-basic.c b/dbus/dbus-marshal-basic.c index 0a33ff15..724d94b8 100644 --- a/dbus/dbus-marshal-basic.c +++ b/dbus/dbus-marshal-basic.c @@ -1333,7 +1333,7 @@ _dbus_verbose_bytes (const unsigned char *data, if (aligned != data) { - _dbus_verbose ("%4d\t%p: ", - (data - aligned), aligned); + _dbus_verbose ("%4ld\t%p: ", - (long)(data - aligned), aligned); while (aligned != data) { _dbus_verbose (" "); diff --git a/dbus/dbus-spawn.c b/dbus/dbus-spawn.c index 35ccba6c..f4e3b587 100644 --- a/dbus/dbus-spawn.c +++ b/dbus/dbus-spawn.c @@ -36,6 +36,8 @@ #include <errno.h> #endif +extern char **environ; + /** * @addtogroup DBusInternalsUtils * @{ @@ -914,8 +916,6 @@ do_exec (int child_err_report_fd, if (envp == NULL) { - extern char **environ; - _dbus_assert (environ != NULL); envp = environ; diff --git a/dbus/dbus-sysdeps-util-unix.c b/dbus/dbus-sysdeps-util-unix.c index 6ca662b2..be7bc968 100644 --- a/dbus/dbus-sysdeps-util-unix.c +++ b/dbus/dbus-sysdeps-util-unix.c @@ -43,6 +43,7 @@ #include <sys/socket.h> #include <dirent.h> #include <sys/un.h> +#include <syslog.h> #ifdef HAVE_LIBAUDIT #include <sys/prctl.h> #include <sys/capability.h> diff --git a/dbus/dbus-sysdeps.c b/dbus/dbus-sysdeps.c index d740f875..00a1a3de 100644 --- a/dbus/dbus-sysdeps.c +++ b/dbus/dbus-sysdeps.c @@ -51,6 +51,8 @@ _DBUS_DEFINE_GLOBAL_LOCK (win_fds); _DBUS_DEFINE_GLOBAL_LOCK (sid_atom_cache); _DBUS_DEFINE_GLOBAL_LOCK (system_users); +extern char **environ; + /** * @defgroup DBusSysdeps Internal system-dependent API * @ingroup DBusInternals @@ -191,7 +193,6 @@ _dbus_clearenv (void) if (clearenv () != 0) rc = FALSE; #else - extern char **environ; if (environ != NULL) environ[0] = NULL; @@ -210,7 +211,6 @@ char ** _dbus_get_environment (void) { int i, length; - extern char **environ; char **environment; _dbus_assert (environ != NULL); |