libglib_gcc3-patch 934 B

12345678910111213141516171819202122232425
  1. --- glib-1.2.10/glib.orig.h 2004-10-14 01:11:45.000000000 -0600
  2. +++ glib-1.2.10/glib.h 2004-10-14 01:12:02.000000000 -0600
  3. @@ -271,14 +271,15 @@
  4. /* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with
  5. * macros, so we can refer to them as strings unconditionally.
  6. + * usage not-recommended since gcc-3.0
  7. */
  8. -#ifdef __GNUC__
  9. -#define G_GNUC_FUNCTION __FUNCTION__
  10. -#define G_GNUC_PRETTY_FUNCTION __PRETTY_FUNCTION__
  11. -#else /* !__GNUC__ */
  12. -#define G_GNUC_FUNCTION ""
  13. -#define G_GNUC_PRETTY_FUNCTION ""
  14. -#endif /* !__GNUC__ */
  15. +#if defined (__GNUC__) && (__GNUC__ < 3)
  16. +#define G_GNUC_FUNCTION __FUNCTION__
  17. +#define G_GNUC_PRETTY_FUNCTION __PRETTY_FUNCTION__
  18. +#else /* !__GNUC__ */
  19. +#define G_GNUC_FUNCTION ""
  20. +#define G_GNUC_PRETTY_FUNCTION ""
  21. +#endif /* !__GNUC__ */
  22. /* we try to provide a usefull equivalent for ATEXIT if it is
  23. * not defined, but use is actually abandoned. people should