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.

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