diff --git a/include/limits.h b/include/limits.h
index a954917654a..a1de4421176 100644
--- a/include/limits.h
+++ b/include/limits.h
@@ -293,7 +293,7 @@
  *   Minimum Acceptable Value: 10000
  */
 
-#define TMP_MAX10000
+#define TMP_MAX 10000
 
 /* Required for asynchronous I/O */
 
diff --git a/libs/libc/stdio/lib_libvsprintf.c b/libs/libc/stdio/lib_libvsprintf.c
index 5b41e8bef5b..a5e0ae3ec88 100644
--- a/libs/libc/stdio/lib_libvsprintf.c
+++ b/libs/libc/stdio/lib_libvsprintf.c
@@ -48,6 +48,7 @@
 #include <string.h>
 #include <limits.h>
 
+#include <nuttx/compiler.h>
 #include <nuttx/streams.h>
 
 #include "lib_dtoa_engine.h"
@@ -57,6 +58,16 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
+/* CONFIG_LIBC_LONG_LONG is not a valid selection of the compiler does not
+ * support long long types.
+ */
+
+#ifndef CONFIG_HAVE_LONG_LONG
+#  undef CONFIG_LIBC_LONG_LONG
+#endif
+
+/* [Re]define putc() */
+
 #ifdef putc
 #  undef putc
 #endif