diff options
| author | William Jon McCann <mccann@jhu.edu> | 2007-04-04 09:51:00 +0000 |
|---|---|---|
| committer | William Jon McCann <mccann@src.gnome.org> | 2007-04-04 09:51:00 +0000 |
| commit | d1c5c14ce39c79c9a723e04be1440de7e3201845 (patch) | |
| tree | 20a3f382a9e79876bfc56fddef3babb068b8d7cc | |
| parent | 5a22f79062e214796c55cd9756cda82a54c52ca6 (diff) | |
| download | gdm-d1c5c14ce39c79c9a723e04be1440de7e3201845.tar.gz | |
Fix building on Solaris.
2007-04-04 William Jon McCann <mccann@jhu.edu>
* common/gdm-log.c: (gdm_log_init):
* daemon/misc.h:
Fix building on Solaris.
svn path=/trunk/; revision=4765
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | common/gdm-log.c | 8 | ||||
| -rw-r--r-- | daemon/misc.h | 4 |
3 files changed, 15 insertions, 3 deletions
@@ -1,5 +1,11 @@ 2007-04-04 William Jon McCann <mccann@jhu.edu> + * common/gdm-log.c: (gdm_log_init): + * daemon/misc.h: + Fix building on Solaris. + +2007-04-04 William Jon McCann <mccann@jhu.edu> + * daemon/gdm-socket-protocol.h: Oops add file missing from last commit. diff --git a/common/gdm-log.c b/common/gdm-log.c index 9182359e..bc7ecfb2 100644 --- a/common/gdm-log.c +++ b/common/gdm-log.c @@ -166,12 +166,18 @@ void gdm_log_init (void) { const char *prg_name; + int options; g_log_set_default_handler (gdm_log_default_handler, NULL); prg_name = g_get_prgname (); - openlog (prg_name, LOG_PERROR|LOG_PID, LOG_DAEMON); + options = LOG_PID; +#ifdef LOG_PERROR + options |= LOG_PERROR; +#endif + + openlog (prg_name, options, LOG_DAEMON); initialized = TRUE; } diff --git a/daemon/misc.h b/daemon/misc.h index 2a93f69c..96a4fa56 100644 --- a/daemon/misc.h +++ b/daemon/misc.h @@ -150,7 +150,7 @@ gchar * gdm_read_default (gchar *key); gdm_fail ("GDM file %s: line %d (%s): Cannot run seteuid to %d: %s", \ __FILE__, \ __LINE__, \ - __PRETTY_FUNCTION__, \ + G_GNUC_PRETTY_FUNCTION, \ (int)uid, \ strerror (errno)); } #define NEVER_FAILS_setegid(gid) \ @@ -161,7 +161,7 @@ gchar * gdm_read_default (gchar *key); gdm_fail ("GDM file %s: line %d (%s): Cannot run setegid to %d: %s", \ __FILE__, \ __LINE__, \ - __PRETTY_FUNCTION__, \ + G_GNUC_PRETTY_FUNCTION, \ (int)gid, \ strerror (errno)); } |