summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2015-01-01 15:56:25 -0600
committerGregory Nutt <gnutt@nuttx.org>2015-01-01 15:56:25 -0600
commit7a231c727bbb121225c0f5e5e9a27ca21941aa9e (patch)
tree8d1f3dbfb65d80ce2ca4798815d9769dad63a403
parentf0a06710b82034475a71f20fa427c7ce46bca766 (diff)
downloadnuttx-7a231c727bbb121225c0f5e5e9a27ca21941aa9e.tar.gz
nuttx-7a231c727bbb121225c0f5e5e9a27ca21941aa9e.tar.bz2
nuttx-7a231c727bbb121225c0f5e5e9a27ca21941aa9e.zip
There were some changes which broke my NuttX-Build. With these two patches it builds again. From Manuel Stühn
-rw-r--r--nuttx/fs/nfs/nfs_vfsops.c1
-rw-r--r--nuttx/include/cxx/cctype4
2 files changed, 5 insertions, 0 deletions
diff --git a/nuttx/fs/nfs/nfs_vfsops.c b/nuttx/fs/nfs/nfs_vfsops.c
index fe7a77f0d..7a26b530e 100644
--- a/nuttx/fs/nfs/nfs_vfsops.c
+++ b/nuttx/fs/nfs/nfs_vfsops.c
@@ -69,6 +69,7 @@
#include <nuttx/fs/fs.h>
#include <nuttx/fs/nfs.h>
#include <nuttx/net/udp.h>
+#include <nuttx/net/arp.h>
#include <nuttx/net/netconfig.h>
#include <net/if.h>
diff --git a/nuttx/include/cxx/cctype b/nuttx/include/cxx/cctype
index d029544ef..604bc2c23 100644
--- a/nuttx/include/cxx/cctype
+++ b/nuttx/include/cxx/cctype
@@ -44,6 +44,8 @@
// Remove macros in favor of builtin implementations
+#if !defined(CONFIG_UCLIBCXX)
+
#undef isalnum
#undef isalpha
#undef iscntrl
@@ -58,6 +60,8 @@
#undef tolower
#undef toupper
+#endif
+
//***************************************************************************
// Namespace
//***************************************************************************