mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-21 21:21:06 +00:00
5398eceff3
development/libraries/{glib,gtk+,pango,atk,...}. Done for glib/gtk+
1.2. Also deleted some obsolete, unused versions (gtkLibs 2.10,
2.12, and 2.14).
svn path=/nixpkgs/trunk/; revision=17992
21 lines
812 B
Diff
21 lines
812 B
Diff
diff -rc glib-orig/glib.h glib-1.2.10/glib.h
|
|
*** glib-orig/glib.h 2001-02-27 04:44:38.000000000 +0100
|
|
--- glib-1.2.10/glib.h 2004-09-22 10:22:01.000000000 +0200
|
|
***************
|
|
*** 272,278 ****
|
|
/* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with
|
|
* macros, so we can refer to them as strings unconditionally.
|
|
*/
|
|
! #ifdef __GNUC__
|
|
#define G_GNUC_FUNCTION __FUNCTION__
|
|
#define G_GNUC_PRETTY_FUNCTION __PRETTY_FUNCTION__
|
|
#else /* !__GNUC__ */
|
|
--- 272,278 ----
|
|
/* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with
|
|
* macros, so we can refer to them as strings unconditionally.
|
|
*/
|
|
! #if defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ < 4)
|
|
#define G_GNUC_FUNCTION __FUNCTION__
|
|
#define G_GNUC_PRETTY_FUNCTION __PRETTY_FUNCTION__
|
|
#else /* !__GNUC__ */
|