merge from gcc

This commit is contained in:
DJ Delorie 2012-04-10 17:07:35 +00:00
parent 9a82b8ff87
commit b3641a6eb9
4 changed files with 19 additions and 15 deletions

View file

@ -85,13 +85,15 @@ to_ptr32 (char **ptr64)
int argc;
__char_ptr_char_ptr32 short_argv;
for (argc=0; ptr64[argc]; argc++);
/* Count number of arguments. */
for (argc = 0; ptr64[argc] != NULL; argc++)
;
/* Reallocate argv with 32 bit pointers. */
short_argv = (__char_ptr_char_ptr32) decc$malloc
(sizeof (__char_ptr32) * (argc + 1));
for (argc=0; ptr64[argc]; argc++)
for (argc = 0; ptr64[argc] != NULL; argc++)
short_argv[argc] = (__char_ptr32) decc$strdup (ptr64[argc]);
short_argv[argc] = (__char_ptr32) 0;