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
64 lines
2.2 KiB
# --- 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/glibc/glibc23/glibc-2.2.3-string2.patch
|
|
# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
|
|
#
|
|
# This patch file is dual-licensed. It is available under the license the
|
|
# patched project is licensed under, as long as it is an OpenSource license
|
|
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or 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.
|
|
#
|
|
# --- 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;
|
|
}
|