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.

67 lines
2.3 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/glibc22/glibc-2.2.3-string2.patch
  9. # ROCK Linux is Copyright (C) 1998 - 2003 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. Add explicit casts to make sure that "+ 2" and "+ 4" increments
  23. to pointer byte-wise (and not 4-byte words or whatever else).
  24. --- ./string/bits/string2.h.old Tue Jun 12 12:52:46 2001
  25. +++ ./string/bits/string2.h Tue Jun 12 12:53:51 2001
  26. @@ -415,7 +415,7 @@
  27. break;
  28. case 3:
  29. __u->__usi = __src0_2;
  30. - __u = __extension__ ((void *) __u + 2);
  31. + __u = __extension__ (void *)((char *) __u + 2);
  32. __u->__uc = '\0';
  33. break;
  34. case 4:
  35. @@ -423,24 +423,24 @@
  36. break;
  37. case 5:
  38. __u->__ui = __src0_4;
  39. - __u = __extension__ ((void *) __u + 4);
  40. + __u = __extension__ (void *)((char *) __u + 4);
  41. __u->__uc = '\0';
  42. break;
  43. case 6:
  44. __u->__ui = __src0_4;
  45. - __u = __extension__ ((void *) __u + 4);
  46. + __u = __extension__ (void *)((char *) __u + 4);
  47. __u->__usi = __src4_2;
  48. break;
  49. case 7:
  50. __u->__ui = __src0_4;
  51. - __u = __extension__ ((void *) __u + 4);
  52. + __u = __extension__ (void *)((char *) __u + 4);
  53. __u->__usi = __src4_2;
  54. - __u = __extension__ ((void *) __u + 2);
  55. + __u = __extension__ (void *)((char *) __u + 2);
  56. __u->__uc = '\0';
  57. break;
  58. case 8:
  59. __u->__ui = __src0_4;
  60. - __u = __extension__ ((void *) __u + 4);
  61. + __u = __extension__ (void *)((char *) __u + 4);
  62. __u->__ui = __src4_4;
  63. break;
  64. }