Author: madcoder
Date: 2007-10-27 11:32:02 +0000 (Sat, 27 Oct 2007)
New Revision: 2618
Added:
glibc-package/branches/glibc-2.7/debian/patches/locale/preprocessor-collate-uli-sucks.diff
Modified:
glibc-package/branches/glibc-2.7/debian/changelog
glibc-package/branches/glibc-2.7/debian/patches/series
Log:
Fix Uli's preprocessor.
Signed-off-by: Pierre Habouzit <[EMAIL PROTECTED]>
Modified: glibc-package/branches/glibc-2.7/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.7/debian/changelog 2007-10-27 11:31:58 UTC
(rev 2617)
+++ glibc-package/branches/glibc-2.7/debian/changelog 2007-10-27 11:32:02 UTC
(rev 2618)
@@ -6,12 +6,14 @@
* Update any/submitted-rfc3484-sortv4.diff.
* Update localedata/*first_weekday.diff.
* Remove localedata/fix-am_ET.diff (obsolete).
+ * Add locale/preprocessor-collate-uli-sucks.diff to fix endless loop when
+ ifdef is used.
[ Aurelien Jarno ]
* Improve any/submitted-rfc3484-sortv4.diff.
* Update hurd-i386/submitted-trivial.diff.
- -- Pierre Habouzit <[EMAIL PROTECTED]> Sat, 27 Oct 2007 10:49:49 +0200
+ -- Pierre Habouzit <[EMAIL PROTECTED]> Sat, 27 Oct 2007 13:29:45 +0200
glibc (2.7-0exp1) experimental; urgency=low
Added:
glibc-package/branches/glibc-2.7/debian/patches/locale/preprocessor-collate-uli-sucks.diff
===================================================================
---
glibc-package/branches/glibc-2.7/debian/patches/locale/preprocessor-collate-uli-sucks.diff
(rev 0)
+++
glibc-package/branches/glibc-2.7/debian/patches/locale/preprocessor-collate-uli-sucks.diff
2007-10-27 11:32:02 UTC (rev 2618)
@@ -0,0 +1,11 @@
+--- locale/programs/ld-collate.c.orig
++++ locale/programs/ld-collate.c
+@@ -4034,6 +4034,8 @@
+ arg->val.str.lenmb) == 0
+ && curdef->str[arg->val.str.lenmb] == '\0')
+ break;
++ else
++ curdef = curdef->next;
+
+ if ((nowtok == tok_ifdef && curdef != NULL)
+ || (nowtok == tok_ifndef && curdef == NULL))
Modified: glibc-package/branches/glibc-2.7/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.7/debian/patches/series 2007-10-27
11:31:58 UTC (rev 2617)
+++ glibc-package/branches/glibc-2.7/debian/patches/series 2007-10-27
11:32:02 UTC (rev 2618)
@@ -1,6 +1,7 @@
locale/check-unknown-symbols.diff
locale/fix-LC_COLLATE-rules.diff -p0
-# locale/preprocessor-collate.diff -p0 # should not be needed
anymore
+# locale/preprocessor-collate.diff -p0 # should not be needed
anymore, but keep it anyways.
+locale/preprocessor-collate-uli-sucks.diff -p0
locale/locale-print-LANGUAGE.diff -p0
locale/LC_IDENTIFICATION-optional-fields.diff -p0
locale/fix-C-first_weekday.diff -p0
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
