4 files changed, 14 insertions, 6 deletions
diff --git a/nuttx/examples/nettest/Makefile b/nuttx/examples/nettest/Makefile
index 0dd12ccbf..6677f847f 100644
--- a/nuttx/examples/nettest/Makefile
+++ b/nuttx/examples/nettest/Makefile
@@ -41,9 +41,9 @@ TARG_AOBJS	= $(TARG_ASRCS:.S=$(OBJEXT))
 
 TARG_CSRCS	= nettest.c
 ifeq ($(CONFIG_EXAMPLE_NETTEST_SERVER),y)
-TARG_CSRCS	+= nettest-server.c
+TARG_CSRCS	+= nettest_server.c
 else
-TARG_CSRCS	+= nettest-client.c
+TARG_CSRCS	+= nettest_client.c
 endif
 
 TARG_COBJS	= $(TARG_CSRCS:.c=$(OBJEXT))
@@ -61,9 +61,9 @@ endif
 
 HOST_SRCS	= host.c
 ifeq ($(CONFIG_EXAMPLE_NETTEST_SERVER),y)
-HOST_SRCS	+= nettest-client.c
+HOST_SRCS	+= nettest_client.c
 else
-HOST_SRCS	+= nettest-server.c
+HOST_SRCS	+= nettest_server.c
 endif
 
 HOST_OBJS	= $(HOST_SRCS:.c=.o)
diff --git a/nuttx/examples/nettest/nettest.h b/nuttx/examples/nettest/nettest.h
index db84ac495..fafe29355 100644
--- a/nuttx/examples/nettest/nettest.h
+++ b/nuttx/examples/nettest/nettest.h
@@ -57,7 +57,11 @@
 
    /* Used printf for debug output */
 
-#  define message(...)   printf(__VA_ARGS__)
+#  ifdef CONFIG_CPP_HAVE_VARARGS
+#    define message(...) printf(__VA_ARGS__)
+#  else
+#    define message printf
+#  endif
 
    /* Have SO_LINGER */
 
@@ -67,7 +71,11 @@
 
    /* Used lib_rawprintf() so that there is not confusion from buffered IO */
 
-# define message(...) lib_rawprintf(__VA_ARGS__)
+#  ifdef CONFIG_CPP_HAVE_VARARGS
+#    define message(...) lib_rawprintf(__VA_ARGS__)
+#  else
+#    define message lib_rawprintf
+#  endif
 
    /* At present, uIP does only abortive disconnects */
 
diff --git a/nuttx/examples/nettest/nettest-client.c b/nuttx/examples/nettest/nettest_client.c
index 371f4d4f8..371f4d4f8 100644
--- a/nuttx/examples/nettest/nettest-client.c
+++ b/nuttx/examples/nettest/nettest_client.c
diff --git a/nuttx/examples/nettest/nettest-server.c b/nuttx/examples/nettest/nettest_server.c
index 6d9ccaeba..6d9ccaeba 100644
--- a/nuttx/examples/nettest/nettest-server.c
+++ b/nuttx/examples/nettest/nettest_server.c