mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

41 lines
1.5 KiB

  1. # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
  2. #
  3. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  4. # Please add additional copyright information _after_ the line containing
  5. # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
  6. # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
  7. #
  8. # ROCK Linux: rock-src/package/stf/pegasus/gcc34.patch
  9. # ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
  10. #
  11. # This patch file is dual-licensed. It is available under the license the
  12. # patched project is licensed under, as long as it is an OpenSource license
  13. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  14. # of the GNU General Public License as published by the Free Software
  15. # Foundation; either version 2 of the License, or (at your option) any later
  16. # version.
  17. #
  18. # --- ROCK-COPYRIGHT-NOTE-END ---
  19. --- pegasus-2.3.2/src/Pegasus/Common/Platform_LINUX_IX86_GNU.h 2003-10-22 14:26:03.000000000 +0000
  20. +++ pegasus-2.3.2-patched/src/Pegasus/Common/Platform_LINUX_IX86_GNU.h 2004-06-20 01:17:37.000000000 +0000
  21. @@ -59,7 +59,7 @@
  22. #define PEGASUS_HAVE_FOR_SCOPE
  23. -// #define PEGASUS_HAVE_TEMPLATE_SPECIALIZATION
  24. +#define PEGASUS_HAVE_TEMPLATE_SPECIALIZATION
  25. #ifndef _GNU_SOURCE
  26. #define _GNU_SOURCE
  27. @@ -71,7 +71,7 @@
  28. #include <features.h>
  29. #include <stdio.h>
  30. #include <stdlib.h>
  31. -#ifndef min
  32. -#define min(a,b) (((a)<(b))?(a):(b))
  33. -#endif
  34. +// #ifndef min
  35. +// #define min(a,b) (((a)<(b))?(a):(b))
  36. +// #endif
  37. #endif /* Pegasus_Platform_LINUX_IX86_GNU_h */