Index: generic/nsf.c
===================================================================
diff -u -N -r68d3e5d49c902a2abbf48704d0bcdc9bbfd1667f -rbfe8276e7cf9460ea643acc87e1474edd720bd42
--- generic/nsf.c	(.../nsf.c)	(revision 68d3e5d49c902a2abbf48704d0bcdc9bbfd1667f)
+++ generic/nsf.c	(.../nsf.c)	(revision bfe8276e7cf9460ea643acc87e1474edd720bd42)
@@ -2869,7 +2869,9 @@
     order = NULL;
   }
 
-  // TODO: if this holds, we can change the fn to returns_nonnull and the else-branch is not needed
+  /* 
+   * TODO: if this holds, we can change the fn to returns_nonnull and the else-branch is not needed
+   */
   assert(order);
   AssertOrderIsWhite(order);
 
@@ -2915,7 +2917,9 @@
     order = NULL;
   }
 
-  // TODO: if this holds, we can change the fn to returns_nonnull and the else-branch is not needed
+  /* 
+   * TODO: if this holds, we can change the fn to returns_nonnull and the else-branch is not needed
+   */
 
   assert(order);
   AssertOrderIsWhite(order);
@@ -11218,7 +11222,9 @@
   assert(interp);
   assert(cmd);
 
-  // TODO This function might store empty paramDefs. needed?
+  /*
+   * TODO This function might store empty paramDefs. needed?
+   */
 
   if (cmdPtr->deleteProc != NsfProcDeleteProc) {
     NsfProcContext *ctxPtr = NEW(NsfProcContext);
@@ -21405,7 +21411,7 @@
                 if (argumentString[1] >= '0' && argumentString[1] <= '9') {
                   char *p;
 
-                  strtod(&argumentString[1], &p);
+                  (void)strtod(&argumentString[1], &p);
                   if (*p == '\0') {
                     /* argument is numeric */
                     nonposArgError = 0;