From e9cec9057b12928a475085f93b71246032bc8b28 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Thu, 1 Jan 2015 15:56:25 -0600
Subject: [PATCH] =?UTF-8?q?There=20were=20some=20changes=20which=20broke?=
 =?UTF-8?q?=20my=20NuttX-Build.=20With=20these=20two=20patches=20it=20buil?=
 =?UTF-8?q?ds=20again.=20=20From=20Manuel=20St=C3=BChn?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fs/nfs/nfs_vfsops.c | 1 +
 include/cxx/cctype  | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/fs/nfs/nfs_vfsops.c b/fs/nfs/nfs_vfsops.c
index fe7a77f0d3..7a26b530e8 100644
--- a/fs/nfs/nfs_vfsops.c
+++ b/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/include/cxx/cctype b/include/cxx/cctype
index d029544ef0..604bc2c23d 100644
--- a/include/cxx/cctype
+++ b/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
 //***************************************************************************