diff --git a/src/Makefile b/src/Makefile
index f8f3c968..6c15aa3e 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -228,6 +228,7 @@ endif	# linux
 
 ifeq ($(target),linux-intelc70)
 CC = icc
+CXX = icpc
 CCARCH += -march=i386 -mcpu=i686
 CFLAGS_OUTPUT = -o $@
 LINK_EXE_OUTPUT = -o $@
diff --git a/src/snprintf.cpp b/src/snprintf.cpp
index 785724fb..c05450b2 100644
--- a/src/snprintf.cpp
+++ b/src/snprintf.cpp
@@ -700,7 +700,7 @@ static size_t dopr(char *buffer, size_t maxlen, const char *format, va_list args
                 dopr_outch (buffer, &currlen, maxlen, va_arg (args, int));
                 break;
             case 's':
-                strvalue = va_arg (args, char *);
+                strvalue = va_arg (args, const char *);
                 if (!strvalue) strvalue = "(NULL)";
                 if (max == -1) {
                     max = strlen(strvalue);
@@ -709,7 +709,7 @@ static size_t dopr(char *buffer, size_t maxlen, const char *format, va_list args
                 fmtstr (buffer, &currlen, maxlen, strvalue, flags, min, max);
                 break;
             case 'p':
-                strvalue = (const char *) va_arg (args, void *);
+                strvalue = (const char *) va_arg (args, const void *);
                 fmtint (buffer, &currlen, maxlen, (long) strvalue, 16, min, max, flags);
                 break;
             case 'n':