[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#315347: glibc: patch file 10_cvs.dpatch fails in different place now



Package: glibc
Followup-For: Bug #315347


Hi, the patch file 10_cvs.dpatch now fails during processing of 
wctype/wchar-lookup.h 

end of 10_cvs.dpatch is:

diff -urN -x CVS -x nptl -x nptl_db -x .cvsignore -x '*texi' -x 
'*manual*' glibc-2.3.2/wctype/wchar-lookup.h 
/home/jbailey/Programming/cvstree/libc/wctype/wchar-lookup.h
--- glibc-2.3.2/wctype/wchar-lookup.h   2001-07-07 15:21:39.000000000 
-0400
+++ /home/jbailey/Programming/cvstree/libc/wctype/wchar-lookup.h        
2003-08-21 08:37:19.000000000 -0400
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2003 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Bruno Haible <haible@clisp.cons.org>, 2000.

@@ -49,6 +49,7 @@
 */

 static __inline int
+__attribute ((always_inline))
 wctype_table_lookup (const char *table, uint32_t wc)
 {
   uint32_t shift1 = ((const uint32_t *) table)[0];
@@ -80,6 +81,7 @@
    unit is a single byte, and no 5 bits are used as a word index.  */

 static __inline int
+__attribute ((always_inline))
 wcwidth_table_lookup (const char *table, uint32_t wc)
 {
   uint32_t shift1 = ((const uint32_t *) table)[0];
@@ -113,6 +115,7 @@
    bits are used as a word index.  */

 static __inline uint32_t
+__attribute ((always_inline))
 wctrans_table_lookup (const char *table, uint32_t wc)
 {
   uint32_t shift1 = ((const uint32_t *) table)[0];


-- System Information:
Debian Release: testing/unstable
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable')
Architecture: i386 (i586)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.11mmx2
Locale: LANG=en_AU.UTF-8, LC_CTYPE=en_AU.UTF-8 (charmap=UTF-8)



Reply to: