Index: /trunk/docs/Changelog
===================================================================
--- /trunk/docs/Changelog	(revision 236)
+++ /trunk/docs/Changelog	(revision 237)
@@ -1,3 +1,6 @@
 2.5.7:
+	* eliminate C99-style comments (problem reported by
+	  venkat)
+	* fix bad variable name for AC_CACHE_CHECK
 	* fix potential deadlock when external programm is called
 	  (problem reported by A. Dunkel)
Index: /trunk/src/cutest_sh_unix.c
===================================================================
--- /trunk/src/cutest_sh_unix.c	(revision 236)
+++ /trunk/src/cutest_sh_unix.c	(revision 237)
@@ -11,5 +11,5 @@
 void Test_dnmalloc (CuTest *tc) {
 
-  const int nalloc = 64 /* original dnmalloc 1.0-beta5 fails fo >= 45 */;
+  const int nalloc = 64 /* original dnmalloc 1.0-beta5 fails for >= 45 */;
   int j, i;
   int sum;
@@ -90,5 +90,5 @@
       CuAssertPtrNotNull(tc, area[j]);
 #ifndef USE_SYSTEM_MALLOC
-      // CuAssertIntEquals (tc, malloc_count, (i_malloc + (j+1)));
+      /* CuAssertIntEquals (tc, malloc_count, (i_malloc + (j+1))); */
 #endif
       memset(area[j], (unsigned char) ('a'+1), (j+1) * 1024);
Index: /trunk/src/dnmalloc.c
===================================================================
--- /trunk/src/dnmalloc.c	(revision 236)
+++ /trunk/src/dnmalloc.c	(revision 237)
@@ -2919,5 +2919,5 @@
        }
 #ifdef DNMALLOC_CHECKS
-       // This should never occur but if it does, we'd like to know
+       /* This should never occur but if it does, we'd like to know */
        if (!ci) {
 	 fprintf (stderr,
@@ -4661,5 +4661,5 @@
   }
   else {
-    // Initialize dnmalloc
+    /* Initialize dnmalloc */
     dnmalloc_init();
     malloc_init_state(get_malloc_state());
@@ -4902,5 +4902,5 @@
 
     /* Note the extra SIZE_SZ overhead */
-    //newsize = (nb + offset + SIZE_SZ + pagemask) & ~pagemask;
+    /* newsize = (nb + offset + SIZE_SZ + pagemask) & ~pagemask; */
     newsize = (nb + offset + pagemask) & ~pagemask;
 
Index: /trunk/src/samhain_hide.c
===================================================================
--- /trunk/src/samhain_hide.c	(revision 236)
+++ /trunk/src/samhain_hide.c	(revision 237)
@@ -581,5 +581,5 @@
 #if SH_KERNEL_NUMERIC >= 132628
   status = (*old_getdents64)(fd, dirp, count);
-  // status = my_real_getdents64(fd, dirp, count);
+  /* status = my_real_getdents64(fd, dirp, count); */
 #else
   status = (*old_getdents64)(fd, dirp, count);
Index: /trunk/src/sh_log_check.c
===================================================================
--- /trunk/src/sh_log_check.c	(revision 236)
+++ /trunk/src/sh_log_check.c	(revision 237)
@@ -1105,5 +1105,5 @@
   printf("%2d: short badpath, expect -4\n", status);
   status = sh_add_watch("SYSLOG:/var/log/messages");
-  // status = sh_add_watch("SYSLOG:/var/log/dpkg.log.1");
+  /* status = sh_add_watch("SYSLOG:/var/log/dpkg.log.1"); */
   printf("%2d: short path ok, expect 0\n", status);
 
@@ -1121,9 +1121,9 @@
     fprintf(stderr, "error in fdopen!\n"); exit(EXIT_FAILURE); }
 
-  for (i = 0; i <  80; ++i) { fputc ('a', fp); } fputc ('\n', fp); // 0
-  for (i = 0; i < 118; ++i) { fputc ('a', fp); } fputc ('\n', fp); // 1
-  for (i = 0; i < 119; ++i) { fputc ('a', fp); } fputc ('\n', fp); // 2
-  for (i = 0; i < 120; ++i) { fputc ('a', fp); } fputc ('\n', fp); // 3
-  for (i = 0; i < 121; ++i) { fputc ('a', fp); } fputc ('\n', fp); // 4
+  for (i = 0; i <  80; ++i) { fputc ('a', fp); } fputc ('\n', fp); /* 0 */
+  for (i = 0; i < 118; ++i) { fputc ('a', fp); } fputc ('\n', fp); /* 1 */
+  for (i = 0; i < 119; ++i) { fputc ('a', fp); } fputc ('\n', fp); /* 2 */
+  for (i = 0; i < 120; ++i) { fputc ('a', fp); } fputc ('\n', fp); /* 3 */
+  for (i = 0; i < 121; ++i) { fputc ('a', fp); } fputc ('\n', fp); /* 4 */
   for (i = 0; i < 238; ++i) { fputc ('a', fp); } fputc ('\n', fp);
   for (i = 0; i < 239; ++i) { fputc ('a', fp); } fputc ('\n', fp);
Index: /trunk/src/sh_portcheck.c
===================================================================
--- /trunk/src/sh_portcheck.c	(revision 236)
+++ /trunk/src/sh_portcheck.c	(revision 237)
@@ -1804,5 +1804,5 @@
   */
 
-  // sh_portchk_add_required ("127.0.0.1 : nlockmgr/tcp, 5308/tcp, nfs/tcp");
+  /* sh_portchk_add_required ("127.0.0.1 : nlockmgr/tcp, 5308/tcp, nfs/tcp"); */
 
   while (argc > 1 && argv[1][0] == '-')
Index: /trunk/src/sh_string.c
===================================================================
--- /trunk/src/sh_string.c	(revision 236)
+++ /trunk/src/sh_string.c	(revision 237)
@@ -656,9 +656,9 @@
   CuAssertPtrNotNull(tc, fp);
 
-  for (i = 0; i <  80; ++i) { fputc ('a', fp); } fputc ('\n', fp); // 0
-  for (i = 0; i < 118; ++i) { fputc ('a', fp); } fputc ('\n', fp); // 1
-  for (i = 0; i < 119; ++i) { fputc ('a', fp); } fputc ('\n', fp); // 2
-  for (i = 0; i < 120; ++i) { fputc ('a', fp); } fputc ('\n', fp); // 3
-  for (i = 0; i < 121; ++i) { fputc ('a', fp); } fputc ('\n', fp); // 4
+  for (i = 0; i <  80; ++i) { fputc ('a', fp); } fputc ('\n', fp); /* 0 */
+  for (i = 0; i < 118; ++i) { fputc ('a', fp); } fputc ('\n', fp); /* 1 */
+  for (i = 0; i < 119; ++i) { fputc ('a', fp); } fputc ('\n', fp); /* 2 */
+  for (i = 0; i < 120; ++i) { fputc ('a', fp); } fputc ('\n', fp); /* 3 */
+  for (i = 0; i < 121; ++i) { fputc ('a', fp); } fputc ('\n', fp); /* 4 */
   for (i = 0; i < 238; ++i) { fputc ('a', fp); } fputc ('\n', fp);
   for (i = 0; i < 239; ++i) { fputc ('a', fp); } fputc ('\n', fp);
Index: /trunk/src/slib.c
===================================================================
--- /trunk/src/slib.c	(revision 236)
+++ /trunk/src/slib.c	(revision 237)
@@ -2029,5 +2029,5 @@
 	    {
 	      mincore(f_map, fbuf.st_size, vec);
-	      // imax = fbuf.st_size/page_size;
+	      /* imax = fbuf.st_size/page_size; */
 	      for (i = 0; i <= vec_size; ++i)
 		{