[PHP-CVS] com php-src: fix windows build: ext/mysqlnd/mysqlnd_debug.h

[Anatoliy Belsky]

Commit:6071bfb325e4facd697c38e4d398d008dd1dc37a
Author:Anatoliy Belsky  Wed, 11 Jul 2012 13:32:19 
+0200
Parents:   bf0154896705afe0da6ee1c7af4dc3d75afd194b
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=6071bfb325e4facd697c38e4d398d008dd1dc37a

Log:
fix windows build

- there should be no trailing white spaces after \ in multiline macros

Changed paths:
  M  ext/mysqlnd/mysqlnd_debug.h


Diff:
diff --git a/ext/mysqlnd/mysqlnd_debug.h b/ext/mysqlnd/mysqlnd_debug.h
index 3441dc7..272cdb2 100644
--- a/ext/mysqlnd/mysqlnd_debug.h
+++ b/ext/mysqlnd/mysqlnd_debug.h
@@ -126,7 +126,7 @@ PHPAPI char * mysqlnd_get_backtrace(uint max_levels, size_t 
* length TSRMLS_DC);
if ((dbg_obj2)) { \
dbg_skip_trace = 
!(dbg_obj2)->m->func_enter((dbg_obj2), __LINE__, __FILE__, func_name, 
strlen(func_name)); \
} \
-   if (dbg_skip_trace); /* shut compiler's 
mouth */\ 
+   if (dbg_skip_trace); /* shut compiler's 
mouth */\
do { \
if (((dbg_obj1) && 
(dbg_obj1)->flags & MYSQLND_DEBUG_PROFILE_CALLS) || \
((dbg_obj2) && 
(dbg_obj2)->flags & MYSQLND_DEBUG_PROFILE_CALLS)) \


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: fix windows build: ext/mysqlnd/mysqlnd_debug.h

[Anatoliy Belsky]

Commit:40af974c7355e8c3ea6744874f470c63bb556c9b
Author:Anatoliy Belsky  Wed, 20 Jun 2012 15:02:49 
+0200
Parents:   6eb169da8cdb83f509a53465825d5ba388866015
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=40af974c7355e8c3ea6744874f470c63bb556c9b

Log:
fix windows build

Changed paths:
  M  ext/mysqlnd/mysqlnd_debug.h


Diff:
diff --git a/ext/mysqlnd/mysqlnd_debug.h b/ext/mysqlnd/mysqlnd_debug.h
index aa5a9e5..5d2d1d2 100644
--- a/ext/mysqlnd/mysqlnd_debug.h
+++ b/ext/mysqlnd/mysqlnd_debug.h
@@ -117,7 +117,7 @@ PHPAPI char * mysqlnd_get_backtrace(uint max_levels, size_t 
* length TSRMLS_DC);
if ((dbg_obj)) { \
dbg_skip_trace = 
!(dbg_obj)->m->func_enter((dbg_obj), __LINE__, __FILE__, func_name, 
strlen(func_name)); \
} \
-   if (dbg_skip_trace); /* shut compiler's 
mouth */\ 
+   if (dbg_skip_trace); /* shut compiler's 
mouth */ \
do { \
if ((dbg_obj) && 
(dbg_obj)->flags & MYSQLND_DEBUG_PROFILE_CALLS) { \

DBG_PROFILE_START_TIME(); \


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php