FAQ
tony2001 Fri Apr 22 04:59:21 2005 EDT

Modified files:
/php-src/ext/com_dotnet com_extension.c
/php-src/sapi/caudium caudium.c
Log:
fix C++ comments


http://cvs.php.net/diff.php/php-src/ext/com_dotnet/com_extension.c?r1=1.15&r2=1.16&ty=u
Index: php-src/ext/com_dotnet/com_extension.c
diff -u php-src/ext/com_dotnet/com_extension.c:1.15 php-src/ext/com_dotnet/com_extension.c:1.16
--- php-src/ext/com_dotnet/com_extension.c:1.15 Tue Jul 27 18:17:40 2004
+++ php-src/ext/com_dotnet/com_extension.c Fri Apr 22 04:59:18 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/

-/* $Id: com_extension.c,v 1.15 2004/07/27 22:17:40 wez Exp $ */
+/* $Id: com_extension.c,v 1.16 2005/04/22 08:59:18 tony2001 Exp $ */

#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -194,12 +194,12 @@
INIT_CLASS_ENTRY(ce, "com_exception", NULL);
php_com_exception_class_entry = zend_register_internal_class_ex(&ce, zend_exception_get_default(), NULL TSRMLS_CC);
php_com_exception_class_entry->ce_flags |= ZEND_ACC_FINAL;
-// php_com_exception_class_entry->constructor->common.fn_flags |= ZEND_ACC_PROTECTED;
+/* php_com_exception_class_entry->constructor->common.fn_flags |= ZEND_ACC_PROTECTED; */

INIT_CLASS_ENTRY(ce, "com_safearray_proxy", NULL);
php_com_saproxy_class_entry = zend_register_internal_class(&ce TSRMLS_CC);
php_com_saproxy_class_entry->ce_flags |= ZEND_ACC_FINAL;
-// php_com_saproxy_class_entry->constructor->common.fn_flags |= ZEND_ACC_PROTECTED;
+/* php_com_saproxy_class_entry->constructor->common.fn_flags |= ZEND_ACC_PROTECTED; */
php_com_saproxy_class_entry->get_iterator = php_com_saproxy_iter_get;

INIT_CLASS_ENTRY(ce, "variant", NULL);
http://cvs.php.net/diff.php/php-src/sapi/caudium/caudium.c?r1=1.34&r2=1.35&ty=u
Index: php-src/sapi/caudium/caudium.c
diff -u php-src/sapi/caudium/caudium.c:1.34 php-src/sapi/caudium/caudium.c:1.35
--- php-src/sapi/caudium/caudium.c:1.34 Mon Dec 20 14:33:36 2004
+++ php-src/sapi/caudium/caudium.c Fri Apr 22 04:59:21 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/

-/* $Id: caudium.c,v 1.34 2004/12/20 19:33:36 rasmus Exp $ */
+/* $Id: caudium.c,v 1.35 2005/04/22 08:59:21 tony2001 Exp $ */

#include "php.h"
#ifdef HAVE_CAUDIUM
@@ -287,7 +287,7 @@
struct svalue *s_headermap, *soldval;
int vallen;
GET_THIS();
- // hval = make_shared_string(value);
+ /* hval = make_shared_string(value); */
ind = make_shared_string(" _headers");
hind = make_shared_binary_string(header_name,
(int)(p - header_name));
@@ -444,7 +444,7 @@
{
/* char buf[512]; */
php_info_print_table_start();
- php_info_print_table_row(2, "SAPI module version", "$Id: caudium.c,v 1.34 2004/12/20 19:33:36 rasmus Exp $");
+ php_info_print_table_row(2, "SAPI module version", "$Id: caudium.c,v 1.35 2005/04/22 08:59:21 tony2001 Exp $");
/* php_info_print_table_row(2, "Build date", Ns_InfoBuildDate());
php_info_print_table_row(2, "Config file path", Ns_InfoConfigFile());
php_info_print_table_row(2, "Error Log path", Ns_InfoErrorLog());
@@ -597,7 +597,7 @@
Pike_interpreter.recoveries = NULL;
call_c_initializers(Pike_interpreter.thread_id);
state->id=th_self();
- // SWAP_OUT_THREAD(OBJ2THREAD(Pike_interpreter.thread_id));
+ /* SWAP_OUT_THREAD(OBJ2THREAD(Pike_interpreter.thread_id)); */
num_threads++;
thread_table_insert(Pike_interpreter.thread_id);
state->status=THREAD_RUNNING;

Search Discussions

  • Wez Furlong at Apr 23, 2005 at 7:00 am
    Bah, com is compiled on windows only using a compiler that groks c++ comments.
    Please try to avoid changing files that don't really need it; I've
    already got to manually merge a big COM/.Net patch because someone
    removed some supposedly unused vars from that extension.

    --Wez.
    On 4/22/05, Antony Dovgal wrote:
    tony2001 Fri Apr 22 04:59:21 2005 EDT

    Modified files:
    /php-src/ext/com_dotnet com_extension.c
  • Derick Rethans at Apr 25, 2005 at 8:38 am

    On Sat, 23 Apr 2005, Wez Furlong wrote:

    Bah, com is compiled on windows only using a compiler that groks c++ comments.
    Please try to avoid changing files that don't really need it; I've
    already got to manually merge a big COM/.Net patch because someone
    removed some supposedly unused vars from that extension.
    Also:
    http://lxr.php.net/source/php-src/CODING_STANDARDS#169

    Derick
  • Wez Furlong at Apr 25, 2005 at 3:18 pm
    Read my comment again.
    That code is ONLY ever compiled using a C++ compiler.
    I have some big commits in that extension that have been broken twice
    in two weeks because of "vanity" code changes.
    All I ask is that people don't mindlessly make such changes without
    running them by an extension maintainer first.

    --Wez.
    On 4/25/05, Derick Rethans wrote:
    On Sat, 23 Apr 2005, Wez Furlong wrote:

    Bah, com is compiled on windows only using a compiler that groks c++ comments.
    Please try to avoid changing files that don't really need it; I've
    already got to manually merge a big COM/.Net patch because someone
    removed some supposedly unused vars from that extension.
    Also:
    http://lxr.php.net/source/php-src/CODING_STANDARDS#169

    Derick
  • Derick Rethans at Apr 25, 2005 at 6:33 pm

    On Mon, 25 Apr 2005, Wez Furlong wrote:

    Read my comment again.
    That code is ONLY ever compiled using a C++ compiler.
    Did you actually read the url? ;-)
    I quote:
    169 [1] Never use C++ style comments (i.e. // comment). Always use C-style
    170 comments instead. PHP is written in C, and is aimed at compiling
    171 under any ANSI-C compliant compiler. Even though many compilers
    172 accept C++-style comments in C code, you have to ensure that your
    173 code would compile with other compilers as well.
    174 The only exception to this rule is code that is Win32-specific,
    175 because the Win32 port is MS-Visual C++ specific, and this compiler
    176 is known to accept C++-style comments in C code.


    Although I do think we normally should not make this exception...

    regards,
    Derick

Related Discussions

Discussion Navigation
viewthread | post
Discussion Overview
groupphp-cvs @
categoriesphp
postedApr 22, '05 at 8:59a
activeApr 25, '05 at 6:33p
posts5
users3
websitephp.net

People

Translate

site design / logo © 2019 Grokbase