|
|
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- # # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # Please add additional copyright information _after_ the line containing # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by # the ./scripts/Create-CopyPatch script. Do not edit this copyright text! # # ROCK Linux: rock-src/package/base/glibc22/glibc-2.2.3-string2.patch # ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. A copy of the GNU General Public # License can be found at Documentation/COPYING. # # Many people helped and are helping developing ROCK Linux. Please # have a look at http://www.rocklinux.org/ and the Documentation/TEAM # file for details. # # --- ROCK-COPYRIGHT-NOTE-END ---
Add explicit casts to make sure that "+ 2" and "+ 4" increments to pointer byte-wise (and not 4-byte words or whatever else).
--- ./string/bits/string2.h.old Tue Jun 12 12:52:46 2001
+++ ./string/bits/string2.h Tue Jun 12 12:53:51 2001
@@ -415,7 +415,7 @@
break; case 3: __u->__usi = __src0_2; - __u = __extension__ ((void *) __u + 2);
+ __u = __extension__ (void *)((char *) __u + 2);
__u->__uc = '\0'; break; case 4: @@ -423,24 +423,24 @@
break; case 5: __u->__ui = __src0_4; - __u = __extension__ ((void *) __u + 4);
+ __u = __extension__ (void *)((char *) __u + 4);
__u->__uc = '\0'; break; case 6: __u->__ui = __src0_4; - __u = __extension__ ((void *) __u + 4);
+ __u = __extension__ (void *)((char *) __u + 4);
__u->__usi = __src4_2; break; case 7: __u->__ui = __src0_4; - __u = __extension__ ((void *) __u + 4);
+ __u = __extension__ (void *)((char *) __u + 4);
__u->__usi = __src4_2; - __u = __extension__ ((void *) __u + 2);
+ __u = __extension__ (void *)((char *) __u + 2);
__u->__uc = '\0'; break; case 8: __u->__ui = __src0_4; - __u = __extension__ ((void *) __u + 4);
+ __u = __extension__ (void *)((char *) __u + 4);
__u->__ui = __src4_4; break; }
|