uClibc-0.9.29-rm-whitespace.patch 3.6 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586
  1. diff -urN uClibc-0.9.29-0rig/include/assert.h uClibc-0.9.29/include/assert.h
  2. --- uClibc-0.9.29-0rig/include/assert.h 2005-11-03 23:42:46.000000000 +0100
  3. +++ uClibc-0.9.29/include/assert.h 2007-08-13 19:10:57.000000000 +0200
  4. @@ -31,7 +31,7 @@
  5. #define _ASSERT_H 1
  6. #include <features.h>
  7. -#if defined __cplusplus && __GNUC_PREREQ (2,95)
  8. +#if defined __cplusplus && __GNUC_PREREQ(2,95)
  9. # define __ASSERT_VOID_CAST static_cast<void>
  10. #else
  11. # define __ASSERT_VOID_CAST (void)
  12. @@ -59,13 +59,17 @@
  13. (__ASSERT_VOID_CAST ((expr) ? 0 : \
  14. (__assert (__STRING(expr), __FILE__, __LINE__, \
  15. __ASSERT_FUNCTION), 0)))
  16. -
  17. +
  18. +/* Define some temporaries to workaround tinyx makedepend bug */
  19. +#define __GNUC_PREREQ_2_6 __GNUC_PREREQ(2, 6)
  20. +#define __GNUC_PREREQ_2_4 __GNUC_PREREQ(2, 4)
  21. /* Version 2.4 and later of GCC define a magical variable `__PRETTY_FUNCTION__'
  22. which contains the name of the function currently being defined.
  23. This is broken in G++ before version 2.6.
  24. C9x has a similar variable called __func__, but prefer the GCC one since
  25. it demangles C++ function names. */
  26. -# if defined __cplusplus ? __GNUC_PREREQ (2, 6) : __GNUC_PREREQ (2, 4)
  27. +
  28. +# if defined __cplusplus ? __GNUC_PREREQ_2_6 : __GNUC_PREREQ_2_4
  29. # define __ASSERT_FUNCTION __PRETTY_FUNCTION__
  30. # else
  31. # if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L
  32. diff -urN uClibc-0.9.29-0rig/include/complex.h uClibc-0.9.29/include/complex.h
  33. --- uClibc-0.9.29-0rig/include/complex.h 2002-05-09 10:15:21.000000000 +0200
  34. +++ uClibc-0.9.29/include/complex.h 2007-08-13 17:55:29.000000000 +0200
  35. @@ -33,7 +33,7 @@
  36. /* We might need to add support for more compilers here. But since ISO
  37. C99 is out hopefully all maintained compilers will soon provide the data
  38. types `float complex' and `double complex'. */
  39. -#if __GNUC_PREREQ (2, 7) && !__GNUC_PREREQ (2, 97)
  40. +#if __GNUC_PREREQ(2, 7) && !__GNUC_PREREQ(2, 97)
  41. # define _Complex __complex__
  42. #endif
  43. diff -urN uClibc-0.9.29-0rig/include/features.h uClibc-0.9.29/include/features.h
  44. --- uClibc-0.9.29-0rig/include/features.h 2006-11-29 22:10:04.000000000 +0100
  45. +++ uClibc-0.9.29/include/features.h 2007-08-13 17:55:51.000000000 +0200
  46. @@ -143,7 +143,7 @@
  47. /* Convenience macros to test the versions of glibc and gcc.
  48. Use them like this:
  49. - #if __GNUC_PREREQ (2,8)
  50. + #if __GNUC_PREREQ(2,8)
  51. ... code requiring gcc 2.8 or later ...
  52. #endif
  53. Note - they won't work for gcc1 or glibc1, since the _MINOR macros
  54. @@ -297,7 +297,7 @@
  55. /* uClibc does not support _FORTIFY_SOURCE */
  56. #undef _FORTIFY_SOURCE
  57. #if defined _FORTIFY_SOURCE && _FORTIFY_SOURCE > 0 \
  58. - && __GNUC_PREREQ (4, 1) && defined __OPTIMIZE__ && __OPTIMIZE__ > 0
  59. + && __GNUC_PREREQ(4, 1) && defined __OPTIMIZE__ && __OPTIMIZE__ > 0
  60. # if _FORTIFY_SOURCE > 1
  61. # define __USE_FORTIFY_LEVEL 2
  62. # else
  63. @@ -366,7 +366,7 @@
  64. #endif /* !ASSEMBLER */
  65. /* Decide whether we can define 'extern inline' functions in headers. */
  66. -#if __GNUC_PREREQ (2, 7) && defined __OPTIMIZE__ \
  67. +#if __GNUC_PREREQ(2, 7) && defined __OPTIMIZE__ \
  68. && !defined __OPTIMIZE_SIZE__ && !defined __NO_INLINE__
  69. # define __USE_EXTERN_INLINES 1
  70. #endif
  71. diff -urN uClibc-0.9.29-0rig/include/tgmath.h uClibc-0.9.29/include/tgmath.h
  72. --- uClibc-0.9.29-0rig/include/tgmath.h 2002-05-09 10:15:21.000000000 +0200
  73. +++ uClibc-0.9.29/include/tgmath.h 2007-08-13 17:56:17.000000000 +0200
  74. @@ -34,7 +34,7 @@
  75. do not try this for now and instead concentrate only on GNU CC. Once
  76. we have more information support for other compilers might follow. */
  77. -#if __GNUC_PREREQ (2, 7)
  78. +#if __GNUC_PREREQ(2, 7)
  79. # ifdef __NO_LONG_DOUBLE_MATH
  80. # define __tgml(fct) fct