- No C++ comments

diff --git a/ext/standard/image.c b/ext/standard/image.c
index cb35773ac06508e2cfc147b06b9addfc83576b44..51a331ae0c58c71f0e45f53b9bf3e9ed16206a89 100644 (file)
--- a/ext/standard/image.c
+++ b/ext/standard/image.c
@@ -724,7 +724,7 @@ static struct gfxinfo *php_handle_iff(php_stream * stream TSRMLS_DC)
 
        result = (struct gfxinfo *) ecalloc(1, sizeof(struct gfxinfo));
 
-       // loop chunks to find BMHD chunk
+       /* loop chunks to find BMHD chunk */
        do {
                if (php_stream_read(stream, a, 8) != 8) {
                        efree(result);
@@ -735,7 +735,7 @@ static struct gfxinfo *php_handle_iff(php_stream * stream TSRMLS_DC)
                if ((size & 1) == 1) {
                        size++;
                }
-               if (chunkId == 0x424d4844) { // BMHD chunk
+               if (chunkId == 0x424d4844) { /* BMHD chunk */
                        if (php_stream_read(stream, a, 9) != 9) {
                                efree(result);
                                return NULL;

diff --git a/ext/standard/info.c b/ext/standard/info.c
index d7c8ff6c289c1281e2d45f2459a0a7bf7354bc18..bc80d841af3f5fab2f28433b007a54fb2940da4a 100644 (file)
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -145,16 +145,16 @@ PHPAPI char *php_get_uname(char mode)
                  dwWindowsMajorVersion, dwWindowsMinorVersion);
         php_uname = tmp_uname;
     } else if (mode == 'n') {
-        // XXX HOW TO GET THIS ON WINDOWS?
+        /* XXX HOW TO GET THIS ON WINDOWS? */
         php_uname = "localhost";
     } else if (mode == 'v') {
         dwBuild = (DWORD)(HIWORD(dwVersion));
         snprintf(tmp_uname, sizeof(tmp_uname), "build %d", dwBuild);
         php_uname = tmp_uname;
     } else if (mode == 'm') {
-        // XXX HOW TO GET THIS ON WINDOWS?
+        /* XXX HOW TO GET THIS ON WINDOWS? */
         php_uname = "i386";
-    } else { // assume mode == 'a'
+    } else { /* assume mode == 'a' */
         /* Get build numbers for Windows NT or Win95 */
         if (dwVersion < 0x80000000){
             dwBuild = (DWORD)(HIWORD(dwVersion));
@@ -184,7 +184,7 @@ PHPAPI char *php_get_uname(char mode)
             php_uname = buf.version;
         } else if (mode == 'm') {
             php_uname = buf.machine;
-        } else { // assume mode == 'a'
+        } else { /* assume mode == 'a' */
             snprintf(tmp_uname, sizeof(tmp_uname), "%s %s %s %s %s",
                      buf.sysname, buf.nodename, buf.release, buf.version,
                      buf.machine);
@@ -295,12 +295,12 @@ PHPAPI void php_print_info(int flag TSRMLS_DC)
                                        php_info_print_table_row(2, "Registered PHP Streams", stream_protocols_buf);
                                        efree(stream_protocols_buf);
                                } else {
-                                       // Any chances we will ever hit this?
+                                       /* Any chances we will ever hit this? */
                                        php_info_print_table_row(2, "Registered PHP Streams", "no streams registered");
                                }
                        } else {
-                               // Any chances we will ever hit this?
-                               php_info_print_table_row(2, "PHP Streams", "disabled"); // ??
+                               /* Any chances we will ever hit this? */
+                               php_info_print_table_row(2, "PHP Streams", "disabled"); /* ?? */
                        }
                }
                

diff --git a/main/memory_streams.c b/main/memory_streams.c
index eae29e4acf1c45b7172fd165909ba6443bae5649..1af7bb9eeb5f1c391d4ff53247576a5f9da3ab27 100644 (file)
--- a/main/memory_streams.c
+++ b/main/memory_streams.c
@@ -475,7 +475,7 @@ PHPAPI php_stream *_php_stream_temp_create(int mode, size_t max_memory_usage STR
        self->mode = mode;
        stream = php_stream_alloc(&php_stream_temp_ops, self, 0, "rwb");
        self->innerstream = php_stream_memory_create(mode);
-//     php_stream_temp_write(stream, NULL, 0 TSRMLS_CC);
+/*     php_stream_temp_write(stream, NULL, 0 TSRMLS_CC); */
        return stream;
 }
 /* }}} */