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.

97 lines
2.9 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/base/dietlibc/pkg_patch/pkg_textutils.patch-x
  9. # ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
  10. #
  11. # This program is free software; you can redistribute it and/or modify
  12. # it under the terms of the GNU General Public License as published by
  13. # the Free Software Foundation; either version 2 of the License, or
  14. # (at your option) any later version. A copy of the GNU General Public
  15. # License can be found at Documentation/COPYING.
  16. #
  17. # Many people helped and are helping developing ROCK Linux. Please
  18. # have a look at http://www.rocklinux.org/ and the Documentation/TEAM
  19. # file for details.
  20. #
  21. # --- ROCK-COPYRIGHT-NOTE-END ---
  22. --- ./lib/getline.c.orig Wed May 1 12:32:27 2002
  23. +++ ./lib/getline.c Wed May 1 12:35:45 2002
  24. @@ -22,10 +22,8 @@
  25. # include <config.h>
  26. #endif
  27. -/* The `getdelim' function is only declared if the following symbol
  28. - is defined. */
  29. -#ifndef _GNU_SOURCE
  30. -# define _GNU_SOURCE 1
  31. +#ifdef _GNU_SOURCE
  32. +# undef _GNU_SOURCE
  33. #endif
  34. #include <stdio.h>
  35. --- ./lib/getline.h.orig Thu May 13 22:51:21 1999
  36. +++ ./lib/getline.h Wed May 1 12:35:45 2002
  37. @@ -17,6 +17,10 @@
  38. #ifndef GETLINE_H_
  39. # define GETLINE_H_ 1
  40. +#ifdef _GNU_SOURCE
  41. +# undef _GNU_SOURCE
  42. +#endif
  43. +
  44. # include <stdio.h>
  45. # ifndef PARAMS
  46. --- ./src/paste.c.orig Wed May 1 12:40:33 2002
  47. +++ ./src/paste.c Wed May 1 12:40:47 2002
  48. @@ -54,11 +54,11 @@
  49. /* Indicates that no delimiter should be added in the current position. */
  50. #define EMPTY_DELIM '\0'
  51. -static FILE dummy_closed;
  52. +static int dummy_closed;
  53. /* Element marking a file that has reached EOF and been closed. */
  54. #define CLOSED (&dummy_closed)
  55. -static FILE dummy_endlist;
  56. +static int dummy_endlist;
  57. /* Element marking end of list of open files. */
  58. #define ENDLIST (&dummy_endlist)
  59. --- ./config.hin.orig 2002-10-09 12:42:20.000000000 +0200
  60. +++ ./config.hin 2002-10-09 12:42:28.000000000 +0200
  61. @@ -1269,11 +1269,6 @@
  62. /* Number of bits in a file offset, on hosts where this is settable. */
  63. #undef _FILE_OFFSET_BITS
  64. -/* Enable GNU extensions on systems that have them. */
  65. -#ifndef _GNU_SOURCE
  66. -# undef _GNU_SOURCE
  67. -#endif
  68. -
  69. /* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
  70. #undef _LARGEFILE_SOURCE
  71. --- ./src/sys2.h.orig 2002-10-09 13:03:20.000000000 +0200
  72. +++ ./src/sys2.h 2002-10-09 13:06:06.000000000 +0200
  73. @@ -264,6 +264,14 @@
  74. # include <inttypes.h> /* for the definition of UINTMAX_MAX */
  75. #endif
  76. +#ifdef __CHAR_UNSIGNED__
  77. +# define CHAR_MIN 0
  78. +# define CHAR_MAX UCHAR_MAX
  79. +#else
  80. +# define CHAR_MIN SCHAR_MIN
  81. +# define CHAR_MAX SCHAR_MAX
  82. +#endif
  83. +
  84. #include <ctype.h>
  85. /* Jim Meyering writes: