mirror of
https://github.com/mirror/make.git
synced 2025-01-31 06:40:49 +08:00
Clean up some preprocessor operations
This commit is contained in:
parent
9b9f3351d1
commit
8285852e55
@ -1693,8 +1693,7 @@ main (int argc, char **argv, char **envp)
|
|||||||
if (strpbrk (argv[0], "/:\\") || strstr (argv[0], "..")
|
if (strpbrk (argv[0], "/:\\") || strstr (argv[0], "..")
|
||||||
|| strneq (argv[0], "//", 2))
|
|| strneq (argv[0], "//", 2))
|
||||||
argv[0] = xstrdup (w32ify (argv[0], 1));
|
argv[0] = xstrdup (w32ify (argv[0], 1));
|
||||||
#else /* MK_OS_W32 */
|
#elif MK_OS_DOS || MK_OS_OS2
|
||||||
#if MK_OS_DOS || MK_OS_OS2
|
|
||||||
if (strchr (argv[0], '\\'))
|
if (strchr (argv[0], '\\'))
|
||||||
{
|
{
|
||||||
char *p;
|
char *p;
|
||||||
@ -1727,7 +1726,6 @@ main (int argc, char **argv, char **envp)
|
|||||||
argv[0] = xstrdup (concat (3, current_directory, "/", argv[0]));
|
argv[0] = xstrdup (concat (3, current_directory, "/", argv[0]));
|
||||||
#endif /* !MK_OS_DOS */
|
#endif /* !MK_OS_DOS */
|
||||||
#endif /* MK_OS_W32 */
|
#endif /* MK_OS_W32 */
|
||||||
#endif
|
|
||||||
|
|
||||||
/* We may move, but until we do, here we are. */
|
/* We may move, but until we do, here we are. */
|
||||||
starting_directory = current_directory;
|
starting_directory = current_directory;
|
||||||
|
Loading…
Reference in New Issue
Block a user