iliaa Thu Apr 29 08:59:23 2004 EDT
Modified files:
/php-src/ext/dom documentfragment.c
/php-src/ext/oci8 php_oci8.h
/php-src/ext/w32api w32api.c
/php-src/ext/msession reqclient.h
/php-src/sapi/milter php_milter.c
Log:
C++ comments.
http://cvs.php.net/diff.php/php-src/ext/dom/documentfragment.c?r1=1.8&r2=1.9&ty=u
Index: php-src/ext/dom/documentfragment.c
diff -u php-src/ext/dom/documentfragment.c:1.8 php-src/ext/dom/documentfragment.c:1.9
--- php-src/ext/dom/documentfragment.c:1.8 Wed Mar 31 12:18:59 2004
+++ php-src/ext/dom/documentfragment.c Thu Apr 29 08:59:22 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: documentfragment.c,v 1.8 2004/03/31 17:18:59 rrichards Exp $ */
+/* $Id: documentfragment.c,v 1.9 2004/04/29 12:59:22 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -63,7 +63,7 @@
if (oldnode != NULL) {
php_libxml_node_free_resource(oldnode TSRMLS_CC);
}
- //php_dom_set_object(intern, nodep TSRMLS_CC);
+ /* php_dom_set_object(intern, nodep TSRMLS_CC); */
php_libxml_increment_node_ptr((php_libxml_node_object *)intern, nodep,
(void *)intern TSRMLS_CC);
}
}
http://cvs.php.net/diff.php/php-src/ext/oci8/php_oci8.h?r1=1.34&r2=1.35&ty=u
Index: php-src/ext/oci8/php_oci8.h
diff -u php-src/ext/oci8/php_oci8.h:1.34 php-src/ext/oci8/php_oci8.h:1.35
--- php-src/ext/oci8/php_oci8.h:1.34 Thu Jan 8 12:32:33 2004
+++ php-src/ext/oci8/php_oci8.h Thu Apr 29 08:59:22 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_oci8.h,v 1.34 2004/01/08 17:32:33 sniper Exp $ */
+/* $Id: php_oci8.h,v 1.35 2004/04/29 12:59:22 iliaa Exp $ */
#if HAVE_OCI8
# ifndef PHP_OCI8_H
@@ -100,8 +100,8 @@
dvoid *ocidescr;
ub4 type;
int lob_current_position;
- int lob_size; // -1 = Lob wasn't initialized yet
- int buffering; // 0 - off, 1 - on, 2 - on and buffer was used
+ int lob_size; /* -1 = Lob wasn't initialized yet */
+ int buffering; /* 0 - off, 1 - on, 2 - on and buffer was used */
} oci_descriptor;
typedef struct {
http://cvs.php.net/diff.php/php-src/ext/w32api/w32api.c?r1=1.14&r2=1.15&ty=u
Index: php-src/ext/w32api/w32api.c
diff -u php-src/ext/w32api/w32api.c:1.14 php-src/ext/w32api/w32api.c:1.15
--- php-src/ext/w32api/w32api.c:1.14 Wed Feb 25 15:16:27 2004
+++ php-src/ext/w32api/w32api.c Thu Apr 29 08:59:22 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: w32api.c,v 1.14 2004/02/25 20:16:27 abies Exp $ */
+/* $Id: w32api.c,v 1.15 2004/04/29 12:59:22 iliaa Exp $ */
/*
* Win32 API Extension for PHP
@@ -819,7 +819,7 @@
FORMAT_MESSAGE_IGNORE_INSERTS,
NULL,
GetLastError(),
- MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
// Default language
+ MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
/* Default language */
(LPTSTR)&message_buffer,
0,
NULL);
@@ -1162,8 +1162,8 @@
int size = 0, i = 0;
FARPROC fp = fh->handle;
- _asm mov stack_pointer, esp // Store stack pointer (esp) in
stack_pointer
- _asm sub esp, 0x100 // Give ourselves 256 bytes on
the stack
+ _asm mov stack_pointer, esp /* Store stack pointer (esp) in
stack_pointer */
+ _asm sub esp, 0x100 /* Give ourselves 256 bytes on
the stack */
for(i = (argc - 1); i >= 0; i--)
http://cvs.php.net/diff.php/php-src/ext/msession/reqclient.h?r1=1.13&r2=1.14&ty=u
Index: php-src/ext/msession/reqclient.h
diff -u php-src/ext/msession/reqclient.h:1.13 php-src/ext/msession/reqclient.h:1.14
--- php-src/ext/msession/reqclient.h:1.13 Tue Jun 10 16:03:32 2003
+++ php-src/ext/msession/reqclient.h Thu Apr 29 08:59:23 2004
@@ -107,11 +107,11 @@
typedef struct _requestBuf
{
- unsigned int type; // Type of packet, dynamic/static
- unsigned int size; // size of memory block
+ unsigned int type; /* Type of packet, dynamic/static */
+ unsigned int size; /* size of memory block */
#if (REQCLIENT_VER >= 030113)
- unsigned int fmt; // format, binary/ascii
- unsigned int reserved; // Just in case
+ unsigned int fmt; /* format, binary/ascii */
+ unsigned int reserved; /* Just in case */
#else
#warning You are using an old Phoenix definition, this will have problems with a
newer version
#endif
http://cvs.php.net/diff.php/php-src/sapi/milter/php_milter.c?r1=1.11&r2=1.12&ty=u
Index: php-src/sapi/milter/php_milter.c
diff -u php-src/sapi/milter/php_milter.c:1.11 php-src/sapi/milter/php_milter.c:1.12
--- php-src/sapi/milter/php_milter.c:1.11 Thu Jan 8 03:18:13 2004
+++ php-src/sapi/milter/php_milter.c Thu Apr 29 08:59:23 2004
@@ -1076,7 +1076,7 @@
ap_php_optind++;
}
- // check if file exists, exit else
+ /* check if file exists, exit else */
if (dofork) {
switch(fork()) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
