summaryrefslogtreecommitdiff
path: root/libc/debian/patches/libc-add-qsort_r.patch
diff options
context:
space:
mode:
Diffstat (limited to 'libc/debian/patches/libc-add-qsort_r.patch')
-rw-r--r--libc/debian/patches/libc-add-qsort_r.patch34
1 files changed, 17 insertions, 17 deletions
diff --git a/libc/debian/patches/libc-add-qsort_r.patch b/libc/debian/patches/libc-add-qsort_r.patch
index db4eab9..a320c2d 100644
--- a/libc/debian/patches/libc-add-qsort_r.patch
+++ b/libc/debian/patches/libc-add-qsort_r.patch
@@ -1,7 +1,7 @@
-Index: libc/usr/src/common/util/qsort.c
+Index: b/usr/src/common/util/qsort.c
===================================================================
---- libc.orig/usr/src/common/util/qsort.c
-+++ libc/usr/src/common/util/qsort.c
+--- a/usr/src/common/util/qsort.c
++++ b/usr/src/common/util/qsort.c
@@ -50,9 +50,15 @@ static void swapb(char *r1, char *r2, si
* note: cstyle specifically prohibits nested conditional operators
* but this is the only way to do the median of 3 function in-line
@@ -79,10 +79,10 @@ Index: libc/usr/src/common/util/qsort.c
if (cv < 0) {
break;
}
-Index: libc/usr/src/lib/libc/port/mapfile-vers
+Index: b/usr/src/lib/libc/port/mapfile-vers
===================================================================
---- libc.orig/usr/src/lib/libc/port/mapfile-vers
-+++ libc/usr/src/lib/libc/port/mapfile-vers
+--- a/usr/src/lib/libc/port/mapfile-vers
++++ b/usr/src/lib/libc/port/mapfile-vers
@@ -289,6 +289,7 @@ SYMBOL_VERSION DYSON_1 {
memrchr;
program_invocation_name;
@@ -91,10 +91,10 @@ Index: libc/usr/src/lib/libc/port/mapfile-vers
rawmemchr;
sendfile;
sendfilev;
-Index: libc/usr/src/lib/libc/i386/Makefile.com
+Index: b/usr/src/lib/libc/i386/Makefile.com
===================================================================
---- libc.orig/usr/src/lib/libc/i386/Makefile.com
-+++ libc/usr/src/lib/libc/i386/Makefile.com
+--- a/usr/src/lib/libc/i386/Makefile.com
++++ b/usr/src/lib/libc/i386/Makefile.com
@@ -101,6 +101,7 @@ COMOBJS= \
bsearch.o \
bzero.o \
@@ -103,17 +103,17 @@ Index: libc/usr/src/lib/libc/i386/Makefile.com
strtol.o \
strtoul.o \
strtoll.o \
-Index: libc/usr/src/common/util/qsort_r.c
+Index: b/usr/src/common/util/qsort_r.c
===================================================================
--- /dev/null
-+++ libc/usr/src/common/util/qsort_r.c
++++ b/usr/src/common/util/qsort_r.c
@@ -0,0 +1,2 @@
+#define QSORT_R
+#include "qsort.c"
-Index: libc/usr/src/lib/libc/amd64/Makefile
+Index: b/usr/src/lib/libc/amd64/Makefile
===================================================================
---- libc.orig/usr/src/lib/libc/amd64/Makefile
-+++ libc/usr/src/lib/libc/amd64/Makefile
+--- a/usr/src/lib/libc/amd64/Makefile
++++ b/usr/src/lib/libc/amd64/Makefile
@@ -100,6 +100,7 @@ COMOBJS= \
bsearch.o \
bzero.o \
@@ -122,10 +122,10 @@ Index: libc/usr/src/lib/libc/amd64/Makefile
strtol.o \
strtoul.o \
strtoll.o \
-Index: libc/usr/src/head/stdlib.h
+Index: b/usr/src/head/stdlib.h
===================================================================
---- libc.orig/usr/src/head/stdlib.h
-+++ libc/usr/src/head/stdlib.h
+--- a/usr/src/head/stdlib.h
++++ b/usr/src/head/stdlib.h
@@ -34,6 +34,8 @@
#ifndef _STDLIB_H
#define _STDLIB_H