More fixes for compilation with current SDCC compiler

include/crc64.h

@@ -40,9 +40,13 @@
  * Included Files
  ****************************************************************************/
 
+#include <nuttx/config.h>
+
 #include <sys/types.h>
 #include <stdint.h>
 
+#ifdef CONFIG_HAVE_LONG_LONG
+
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
@@ -102,4 +106,5 @@ uint64_t crc64(FAR const uint8_t *src, size_t len);
 }
 #endif
 
+#endif /* CONFIG_HAVE_LONG_LONG */
 #endif /* __INCLUDE_CRC64_H */

include/cxx/cwchar

@@ -40,6 +40,8 @@
 // Included Files
 //***************************************************************************
 
+#include <nuttx/config.h>
+
 #include <wchar.h>
 #include <stdlib.h>
 
@@ -112,10 +114,15 @@ namespace std
   using ::wcsrtombs;
   using ::wcsspn;
   using ::wcsstr;
+#ifdef CONFIG_HAVE_DOUBLE
   using ::wcstod;
+#endif
   using ::wcstof;
   using ::wcstok;
   using ::wcstol;
+#ifdef CONFIG_HAVE_LONG_DOUBLE
+  using ::wcstold;
+#endif
   using ::wcstoll;
   using ::wcstoul;
   using ::wcstoull;

include/wchar.h

@@ -1,7 +1,7 @@
 /****************************************************************************
  * include/wchar.h
  *
- *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2014, 2017 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -218,11 +218,15 @@ size_t            wcsrtombs(FAR char *, FAR const wchar_t **, size_t,
                       FAR mbstate_t *);
 size_t            wcsspn(FAR const wchar_t *, FAR const wchar_t *);
 FAR wchar_t      *wcsstr(FAR const wchar_t *, FAR const wchar_t *);
+#ifdef CONFIG_HAVE_DOUBLE
 double            wcstod(FAR const wchar_t *, FAR wchar_t **);
+#endif
 float             wcstof(FAR const wchar_t *, FAR wchar_t **);
 FAR wchar_t      *wcstok(FAR wchar_t *, FAR const wchar_t *, FAR wchar_t **);
 long int          wcstol(FAR const wchar_t *, FAR wchar_t **, int);
+#ifdef CONFIG_HAVE_LONG_DOUBLE
 long double       wcstold(FAR const wchar_t *, FAR wchar_t **);
+#endif
 long long int     wcstoll(FAR const wchar_t *, FAR wchar_t **, int);
 unsigned long int wcstoul(FAR const wchar_t *, FAR wchar_t **, int);
 unsigned long long int wcstoull(FAR const wchar_t *, FAR wchar_t **, int);