From 4504ca7c82ef76e665128825fb4cf78feb65891d Mon Sep 17 00:00:00 2001 From: Jim Paris Date: Fri, 9 Jun 2017 07:40:31 -0600 Subject: [PATCH] Whoops -- that #include wasn't supposed to sneak in there. If present, it may already define a __cxxabiv1::__guard that we could use, but that file comes from libstdc++, and I don't think the NuttX buildroot-based toolchain would have that, which is why we need libxx in the first place. --- libc/netdb/lib_gethostbynamer.c | 2 +- libxx/libxx_cxa_guard.cxx | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/libc/netdb/lib_gethostbynamer.c b/libc/netdb/lib_gethostbynamer.c index e95d9a853a..9e1a924bdf 100644 --- a/libc/netdb/lib_gethostbynamer.c +++ b/libc/netdb/lib_gethostbynamer.c @@ -546,7 +546,7 @@ static int lib_dns_lookup(FAR const char *name, FAR struct hostent *host, ptr += addrlen; buflen -= addrlen; - /* And copy name */ + /* And copy the name */ namelen = strlen(name); if (addrlen + namelen + 1 > buflen) diff --git a/libxx/libxx_cxa_guard.cxx b/libxx/libxx_cxa_guard.cxx index 8612400bcd..995ef7b7b1 100644 --- a/libxx/libxx_cxa_guard.cxx +++ b/libxx/libxx_cxa_guard.cxx @@ -38,7 +38,6 @@ //*************************************************************************** #include -#include //*************************************************************************** // Pre-processor Definitions