summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Granseuer <jensgr@gmx.net>2008-05-13 19:28:40 +0000
committerJens Granseuer <jensg@src.gnome.org>2008-05-13 19:28:40 +0000
commite0e32e8c5e5053da524588848287922f2f074af8 (patch)
treef740d251f2158dd860e14faed7edb57a6987c44f
parentc67b1cad91e35ee688275c7b5d61813f86b6831d (diff)
downloadgnome-control-center-e0e32e8c5e5053da524588848287922f2f074af8.tar.gz
Patch by: Laszlo Peter <laca@sun.com>
2008-05-13 Jens Granseuer <jensgr@gmx.net> Patch by: Laszlo Peter <laca@sun.com> * gnome-about-me.c: (get_user_login): fix build on Solaris when _POSIX_PTHREAD_SEMANTICS is defined (bug #532893) svn path=/trunk/; revision=8702
-rw-r--r--capplets/about-me/ChangeLog7
-rw-r--r--capplets/about-me/gnome-about-me.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/capplets/about-me/ChangeLog b/capplets/about-me/ChangeLog
index 35f608b67..ae5d152d4 100644
--- a/capplets/about-me/ChangeLog
+++ b/capplets/about-me/ChangeLog
@@ -1,3 +1,10 @@
+2008-05-13 Jens Granseuer <jensgr@gmx.net>
+
+ Patch by: Laszlo Peter <laca@sun.com>
+
+ * gnome-about-me.c: (get_user_login): fix build on Solaris when
+ _POSIX_PTHREAD_SEMANTICS is defined (bug #532893)
+
2008-05-08 Jens Granseuer <jensgr@gmx.net>
Patch by: Ben LeMasurier <ben.lemasurier@gmail.com>
diff --git a/capplets/about-me/gnome-about-me.c b/capplets/about-me/gnome-about-me.c
index 1c6162dfa..b44aa3f41 100644
--- a/capplets/about-me/gnome-about-me.c
+++ b/capplets/about-me/gnome-about-me.c
@@ -333,7 +333,7 @@ get_user_login (void)
struct passwd pwd, *err;
int i;
-#if __sun
+#if defined(__sun) && !defined(_POSIX_PTHREAD_SEMANTICS)
i = getpwuid_r (getuid (), &pwd, buf, sizeof (buf));
return (i != 0) ? g_strdup (pwd.pw_name) : NULL;
#else