summaryrefslogtreecommitdiff
path: root/extra/locale
diff options
context:
space:
mode:
authorAustin Foxley <austinf@cetoncorp.com>2009-11-22 11:46:31 -0800
committerAustin Foxley <austinf@cetoncorp.com>2009-11-22 11:51:37 -0800
commitf757db2d319ccc5f7034165046fb2bb58901afb1 (patch)
tree7dc465febb3a802d3f0e8856fcda856b13b04c0a /extra/locale
parent76c0c0ed99f74b8a5965be6e1c6a0c0e7a72513c (diff)
parentb71274eebd68b7c68ab95c856f8075bdf4524cd7 (diff)
Merge remote branch 'origin/master' into nptl_merge
Conflicts: Rules.mak libc/misc/sysvipc/msgq.c test/Rules.mak Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
Diffstat (limited to 'extra/locale')
-rw-r--r--extra/locale/locale_mmap.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/extra/locale/locale_mmap.h b/extra/locale/locale_mmap.h
index 4b231ef9e..5b0df9074 100644
--- a/extra/locale/locale_mmap.h
+++ b/extra/locale/locale_mmap.h
@@ -50,24 +50,24 @@ typedef struct {
/* width?? */
#endif
- __LOCALE_DATA_COMMON_MMAP(ctype);
- __LOCALE_DATA_COMMON_MMAP(numeric);
- __LOCALE_DATA_COMMON_MMAP(monetary);
- __LOCALE_DATA_COMMON_MMAP(time);
+ __LOCALE_DATA_COMMON_MMAP(ctype)
+ __LOCALE_DATA_COMMON_MMAP(numeric)
+ __LOCALE_DATA_COMMON_MMAP(monetary)
+ __LOCALE_DATA_COMMON_MMAP(time)
/* collate is different */
- __LOCALE_DATA_COMMON_MMAP(messages);
+ __LOCALE_DATA_COMMON_MMAP(messages)
#ifdef __CTYPE_HAS_8_BIT_LOCALES
const __codeset_8_bit_t codeset_8_bit[__LOCALE_DATA_NUM_CODESETS];
#endif
- __LOCALE_DATA_COMMON_MMIDX(ctype);
- __LOCALE_DATA_COMMON_MMIDX(numeric);
- __LOCALE_DATA_COMMON_MMIDX(monetary);
- __LOCALE_DATA_COMMON_MMIDX(time);
+ __LOCALE_DATA_COMMON_MMIDX(ctype)
+ __LOCALE_DATA_COMMON_MMIDX(numeric)
+ __LOCALE_DATA_COMMON_MMIDX(monetary)
+ __LOCALE_DATA_COMMON_MMIDX(time)
/* collate is different */
- __LOCALE_DATA_COMMON_MMIDX(messages);
+ __LOCALE_DATA_COMMON_MMIDX(messages)
const uint16_t collate_data[__lc_collate_data_LEN];