summaryrefslogtreecommitdiff
path: root/nuttx/lib
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-09-14 14:07:21 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-09-14 14:07:21 +0000
commitb12d1dada94cd7083c2a5a023ec2e7a9a51c192a (patch)
tree78375ed0dfcfed58f45bf266c76a1f9230df01c9 /nuttx/lib
parentbf8d0c68312793631ed4ade1541ec36168b3722b (diff)
downloadpx4-nuttx-b12d1dada94cd7083c2a5a023ec2e7a9a51c192a.tar.gz
px4-nuttx-b12d1dada94cd7083c2a5a023ec2e7a9a51c192a.tar.bz2
px4-nuttx-b12d1dada94cd7083c2a5a023ec2e7a9a51c192a.zip
Add XML RPC server plus NXWM build fixes from Max Holtzberg
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5150 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/lib')
-rw-r--r--nuttx/lib/string/Make.defs6
-rw-r--r--nuttx/lib/string/lib_strtod.c7
2 files changed, 8 insertions, 5 deletions
diff --git a/nuttx/lib/string/Make.defs b/nuttx/lib/string/Make.defs
index 014623eef..6b21c7f14 100644
--- a/nuttx/lib/string/Make.defs
+++ b/nuttx/lib/string/Make.defs
@@ -42,11 +42,7 @@ CSRCS += lib_checkbase.c lib_isbasedigit.c lib_memset.c lib_memchr.c \
lib_strncasecmp.c lib_strncat.c lib_strncmp.c lib_strncpy.c \
lib_strndup.c lib_strcasestr.c lib_strpbrk.c lib_strrchr.c\
lib_strspn.c lib_strstr.c lib_strtok.c lib_strtokr.c lib_strtol.c \
- lib_strtoll.c lib_strtoul.c lib_strtoull.c
-
-ifeq ($(CONFIG_LIBC_FLOATINGPOINT),y)
-CSRCS += lib_strtod.c
-endif
+ lib_strtoll.c lib_strtoul.c lib_strtoull.c lib_strtod.c
# Add the string directory to the build
diff --git a/nuttx/lib/string/lib_strtod.c b/nuttx/lib/string/lib_strtod.c
index 86719c510..8fecd4571 100644
--- a/nuttx/lib/string/lib_strtod.c
+++ b/nuttx/lib/string/lib_strtod.c
@@ -37,10 +37,15 @@
* Included Files
****************************************************************************/
+#include <nuttx/config.h>
+#include <nuttx/compiler.h>
+
#include <stdlib.h>
#include <ctype.h>
#include <errno.h>
+#ifdef CONFIG_HAVE_DOUBLE
+
/****************************************************************************
* Pre-processor definitions
****************************************************************************/
@@ -232,3 +237,5 @@ double_t strtod(const char *str, char **endptr)
return number;
}
+#endif /* CONFIG_HAVE_DOUBLE */
+