From 2f65b8f5c6b4244295a7f1dc8723092e3fd48f0c Mon Sep 17 00:00:00 2001 From: cuz Date: Thu, 3 Aug 2000 10:45:31 +0000 Subject: [PATCH] Remove #pragmas to switch to the RODATA segment since the compiler will do this now without help. git-svn-id: svn://svn.cc65.org/cc65/trunk@263 b7a2c559-68d2-44c3-8de9-860c34a00d81 --- libsrc/common/_hextab.c | 3 --- libsrc/common/errormsg.c | 5 +---- libsrc/common/locale.c | 10 ++-------- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/libsrc/common/_hextab.c b/libsrc/common/_hextab.c index fc82f17d7..d4f24b2ea 100644 --- a/libsrc/common/_hextab.c +++ b/libsrc/common/_hextab.c @@ -7,9 +7,6 @@ -/* Data in this module is read-only, put it into the RODATA segment */ -#pragma dataseg ("RODATA") - const unsigned char _hextab [16] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' diff --git a/libsrc/common/errormsg.c b/libsrc/common/errormsg.c index 4c15ac4cd..d52daeaae 100644 --- a/libsrc/common/errormsg.c +++ b/libsrc/common/errormsg.c @@ -9,10 +9,7 @@ -/* Place the following data into the readonly data segment */ -#pragma dataseg ("RODATA") - -const char* _sys_errlist[] = { +const char* const _sys_errlist[] = { "Unknown error", /* 0 */ "No such file or directory", /* 1 */ "Out of memory", /* 2 */ diff --git a/libsrc/common/locale.c b/libsrc/common/locale.c index ad5fe1c23..5c084a2d0 100644 --- a/libsrc/common/locale.c +++ b/libsrc/common/locale.c @@ -17,13 +17,10 @@ -/* Data in this module is read-only, put it into the RODATA segment */ -#pragma dataseg ("RODATA"); - /* For memory efficiency use a separate empty string */ static const char EmptyString [] = ""; -static struct lconv lc = { +static const struct lconv lc = { EmptyString, /* currency_symbol */ ".", /* decimal_point */ EmptyString, /* grouping */ @@ -44,9 +41,6 @@ static struct lconv lc = { CHAR_MAX, /* p_sign_posn */ }; -/* Restore the old data segment name */ -#pragma dataseg ("DATA"); - /*****************************************************************************/ @@ -75,4 +69,4 @@ char* setlocale (int, const char* locale) - + -- 2.39.5