[Commits] crash.c 1.23.2.39 1.23.2.40

claws at claws-mail.org claws at claws-mail.org
Fri Oct 19 08:34:16 CEST 2012


Update of /home/claws-mail/claws/src
In directory srv:/tmp/cvs-serv20702/src

Modified Files:
      Tag: gtk2
	crash.c 
Log Message:
2012-10-19 [paul]	3.8.1cvs102

	* AUTHORS
	* src/crash.c
	* src/gtk/authors.h
		fix bug 2760, 'display correct libc version in crash dialog 
		when uclibc is used'.
		fixes build with uclibc. patch by Natanael Copa. 

Index: crash.c
===================================================================
RCS file: /home/claws-mail/claws/src/crash.c,v
retrieving revision 1.23.2.39
retrieving revision 1.23.2.40
diff -u -d -r1.23.2.39 -r1.23.2.40
--- crash.c	27 Jul 2012 18:25:38 -0000	1.23.2.39
+++ crash.c	19 Oct 2012 06:34:14 -0000	1.23.2.40
@@ -42,7 +42,7 @@
 #	include <sys/utsname.h>
 #endif
 
-#if defined(__GNU_LIBRARY__)
+#if defined(__GNU_LIBRARY__) && !defined(__UCLIBC__)
 #	include <gnu/libc-version.h>
 #endif
 
@@ -443,7 +443,9 @@
  */
 static const gchar *get_lib_version(void)
 {
-#if defined(__GNU_LIBRARY__)
+#if defined(__UCLIBC__)
+	return g_strdup_printf("uClibc %i.%i.%i", __UCLIBC_MAJOR__, __UCLIBC_MINOR__, __UCLIBC_SUBLEVEL__);
+#elif defined(__GNU_LIBRARY__)
 	return g_strdup_printf("GNU libc %s", gnu_get_libc_version());
 #else
 	return g_strdup(_("Unknown"));



More information about the Commits mailing list