mirror of the now-defunct rocklinux.org
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.

42 lines
1.3 KiB

  1. Fixes
  2. In file included from jis0208.c:23:
  3. jis0208.h:32: error: array type has incomplete element type
  4. when building glibc with gcc-4.0
  5. The bug has been present since at least glibc-2.2.5.
  6. This patch applies cleanly to glibc-2.3.4
  7. --- /home/dank/downloads/glibc-2.3-20050307/iconvdata/jis0208.h 2003-06-11 14:40:42.000000000 -0700
  8. +++ glibc-2.3-20050307/iconvdata/jis0208.h 2005-03-13 20:55:01.784054760 -0800
  9. @@ -24,15 +24,6 @@
  10. #include <gconv.h>
  11. #include <stdint.h>
  12. -/* Conversion table. */
  13. -extern const uint16_t __jis0208_to_ucs[];
  14. -
  15. -extern const char __jisx0208_from_ucs4_lat1[256][2];
  16. -extern const char __jisx0208_from_ucs4_greek[0xc1][2];
  17. -extern const struct jisx0208_ucs_idx __jisx0208_from_ucs_idx[];
  18. -extern const char __jisx0208_from_ucs_tab[][2];
  19. -
  20. -
  21. /* Struct for table with indeces in UCS mapping table. */
  22. struct jisx0208_ucs_idx
  23. {
  24. @@ -42,6 +33,15 @@
  25. };
  26. +/* Conversion table. */
  27. +extern const uint16_t __jis0208_to_ucs[];
  28. +
  29. +extern const char __jisx0208_from_ucs4_lat1[256][2];
  30. +extern const char __jisx0208_from_ucs4_greek[0xc1][2];
  31. +extern const struct jisx0208_ucs_idx __jisx0208_from_ucs_idx[];
  32. +extern const char __jisx0208_from_ucs_tab[][2];
  33. +
  34. +
  35. static inline uint32_t
  36. __attribute ((always_inline))
  37. jisx0208_to_ucs4 (const unsigned char **s, size_t avail, unsigned char offset)