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

* commit 'abd03d348c13b5d5301702151e0729f6a491092f':
  Fix arm64 localtime.c build.
This commit is contained in:
Elliott Hughes 2014-06-19 21:37:43 +00:00 committed by Android Git Automerger
commit dbb4328da3

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