generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 29e3a0e3: Merge "Fix arm64 localtime.c build."

Browse Source 
* commit '29e3a0e312b7a76b91adfd77a399a390ffaed11d':
  Fix arm64 localtime.c build.
This commit is contained in:
Elliott Hughes 2014-06-19 21:31:49 +00:00 committed by Android Git Automerger
commit abd03d348c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libc/tzcode/localtime.c
View File

@ -361,7 +361,7 @@ tzload(register const char* name, register struct state* const sp,
** to hold the longest file name string that the implementation ** to hold the longest file name string that the implementation
** guarantees can be opened." ** guarantees can be opened."
*/ */
char fullname[FILENAME_MAX + 1]; //char fullname[FILENAME_MAX + 1];
/* The main part of the storage for this function. */ /* The main part of the storage for this function. */
struct { struct {
@ -369,7 +369,7 @@ tzload(register const char* name, register struct state* const sp,
struct state st; struct state st;
} u; } u;
}; };
register char *fullname; //register char *fullname;
register u_t *up; register u_t *up;
register union local_storage *lsp; register union local_storage *lsp;
#ifdef ALL_STATE #ifdef ALL_STATE
@ -380,7 +380,7 @@ tzload(register const char* name, register struct state* const sp,
union local_storage ls; union local_storage ls;
lsp = &ls; lsp = &ls;
#endif /* !defined ALL_STATE */ #endif /* !defined ALL_STATE */
fullname = lsp->fullname; //fullname = lsp->fullname;
up = &lsp->u.u; up = &lsp->u.u;
sp->goback = sp->goahead = FALSE; sp->goback = sp->goahead = FALSE;