aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/string.h12
-rw-r--r--stdlib/isomac.c14
2 files changed, 16 insertions, 10 deletions
diff --git a/include/string.h b/include/string.h
index b4ccb1b57f..d9a5eebcbe 100644
--- a/include/string.h
+++ b/include/string.h
@@ -72,11 +72,13 @@ libc_hidden_proto (__strndup)
libc_hidden_proto (__strerror_r)
libc_hidden_proto (__strverscmp)
-# ifndef index
-# define index(s, c) (strchr ((s), (c)))
-# endif
-# ifndef rindex
-# define rindex(s, c) (strrchr ((s), (c)))
+# ifndef _ISOMAC
+# ifndef index
+# define index(s, c) (strchr ((s), (c)))
+# endif
+# ifndef rindex
+# define rindex(s, c) (strrchr ((s), (c)))
+# endif
# endif
#endif
diff --git a/stdlib/isomac.c b/stdlib/isomac.c
index 0229b3fb4f..c0b9ad1db2 100644
--- a/stdlib/isomac.c
+++ b/stdlib/isomac.c
@@ -303,14 +303,18 @@ get_null_defines (void)
start = &line[8];
for (end = start + 1; !isspace (*end) && *end != '\0'; ++end)
;
- result[result_len++] = xstrndup (start, end - start);
+ result[result_len] = xstrndup (start, end - start);
- if (first)
+ if (strcmp (result[result_len], "NOT_IN_libc") != 0)
{
- fputs ("The following identifiers will be ignored since the compiler defines them\nby default:\n", stdout);
- first = 0;
+ if (first)
+ {
+ fputs ("The following identifiers will be ignored since the compiler defines them\nby default:\n", stdout);
+ first = 0;
+ }
+ puts (result[result_len]);
}
- puts (result[result_len - 1]);
+ ++result_len;
}
if (result_len == result_max)
{