qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Thu Mar 9 22:29:03 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu> 

* elf/elf.h (STN_UNDEF): Renamed to SHN_UNDEF (typo).
	(DT_NUM): New macro.

	* locale/nl_langinfo.c: Include errno.h and stddef.h.  Fix typos.

	* locale/lc-ctype.c (_nl_postload_ctype): Fix macro insanity.

	* locale/loadlocale.c (_nl_load_locale) [! MAP_COPY]: Define
 	MAP_COPY to MAP_PRIVATE.
This commit is contained in:
Roland McGrath 1995-03-10 03:58:22 +00:00
parent df4999e1af
commit d8cc5f0c6a
4 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
Thu Mar 9 22:29:03 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* elf/elf.h (STN_UNDEF): Renamed to SHN_UNDEF (typo).
(DT_NUM): New macro.
* locale/nl_langinfo.c: Include errno.h and stddef.h. Fix typos.
* locale/lc-ctype.c (_nl_postload_ctype): Fix macro insanity.
* locale/loadlocale.c (_nl_load_locale) [! MAP_COPY]: Define
MAP_COPY to MAP_PRIVATE.
Thu Mar 9 17:16:53 1995 Brendan Kehoe (brendan@zen.org) Thu Mar 9 17:16:53 1995 Brendan Kehoe (brendan@zen.org)
* sysdeps/alpha/divrem.m4: Undefine `ret' to avoid the definition * sysdeps/alpha/divrem.m4: Undefine `ret' to avoid the definition

3
elf/elf.h
View File

@ -190,7 +190,7 @@ typedef struct
/* Special symbol index. */ /* Special symbol index. */
#define STN_UNDEF 0 /* Undefined symbol */ #define SHN_UNDEF 0 /* Undefined symbol */
/* How to extract and insert information held in the st_info field. */ /* How to extract and insert information held in the st_info field. */
@ -309,6 +309,7 @@ typedef struct
#define DT_DEBUG 21 /* For debugging; unspecified */ #define DT_DEBUG 21 /* For debugging; unspecified */
#define DT_TEXTREL 22 /* Reloc might modify .text */ #define DT_TEXTREL 22 /* Reloc might modify .text */
#define DT_JMPREL 23 /* Address of PLT relocs */ #define DT_JMPREL 23 /* Address of PLT relocs */
#define DT_NUM 24 /* Number used. */
#define DT_LOPROC 0x70000000 /* Start of processor-specific */ #define DT_LOPROC 0x70000000 /* Start of processor-specific */
#define DT_HIPROC 0x7fffffff /* End of processor-specific */ #define DT_HIPROC 0x7fffffff /* End of processor-specific */

5
locale/lc-ctype.c
View File

@ -40,10 +40,11 @@ _nl_postload_ctype (void)
#else #else
#error bizarre byte order #error bizarre byte order
#endif #endif
#define eval(x) x #define paste(a,b) paste1(a,b)
#define paste1(a,b) a##b
#define current(unsigned,x) \ #define current(unsigned,x) \
((const unsigned int *) _NL_CURRENT (LC_CTYPE, _NL_CTYPE_##eval(x)) \ ((const unsigned int *) _NL_CURRENT (LC_CTYPE, paste(_NL_CTYPE_,x)) \
+ 128) + 128)
__ctype_b = current (unsigned short, CLASS); __ctype_b = current (unsigned short, CLASS);

7
locale/nl_langinfo.c
View File

@ -18,6 +18,9 @@ not, write to the Free Software Foundation, Inc., 675 Mass Ave,
Cambridge, MA 02139, USA. */ Cambridge, MA 02139, USA. */
#include <langinfo.h> #include <langinfo.h>
#include <errno.h>
#include <stddef.h>
#include "localeinfo.h"
/* This array duplicates `_nl_current' defined in setlocale.c; but since /* This array duplicates `_nl_current' defined in setlocale.c; but since
the references here are not weak references, this guarantees that the the references here are not weak references, this guarantees that the
@ -49,7 +52,7 @@ nl_langinfo (item)
return NULL; return NULL;
} }
data = nldata[category]; data = *nldata[category];
if (index >= data->nstrings) if (index >= data->nstrings)
{ {
@ -59,5 +62,5 @@ nl_langinfo (item)
} }
/* Return the string for the specified item. */ /* Return the string for the specified item. */
return (char *) nldata->strings[index]; return (char *) data->strings[index];
} }