Permalink
Browse files

- Fixed a couple of -Wall -Winline problems

SVN Rev: 787
  • Loading branch information...
1 parent f3cfbde commit 4bf5687f77e3f367b2991309726db6366d0a823a @derickr derickr committed Sep 2, 2003
Showing with 9 additions and 6 deletions.
  1. +4 −2 xdebug.c
  2. +1 −1 xdebug_profiler.c
  3. +2 −1 xdebug_profiler.h
  4. +2 −2 xdebug_var.c
View
@@ -73,7 +73,7 @@ void (*old_error_cb)(int type, const char *error_filename, const uint error_line
void (*new_error_cb)(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args);
void xdebug_error_cb(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args);
-static inline zval *get_zval(znode *node, temp_variable *Ts, int *is_var);
+static zval *get_zval(znode *node, temp_variable *Ts, int *is_var);
static char* return_trace_stack_frame(function_stack_entry* i, int html TSRMLS_DC);
function_entry xdebug_functions[] = {
@@ -281,6 +281,7 @@ static void php_xdebug_init_globals (zend_xdebug_globals *xg TSRMLS_DC)
xdebug_llist_init(&xg->session, dump_dtor);
}
+#ifdef ZTS
static void php_xdebug_shutdown_globals (zend_xdebug_globals *xg TSRMLS_DC)
{
xdebug_llist_empty(&xg->server, NULL);
@@ -292,6 +293,7 @@ static void php_xdebug_shutdown_globals (zend_xdebug_globals *xg TSRMLS_DC)
xdebug_llist_empty(&xg->request, NULL);
xdebug_llist_empty(&xg->session, NULL);
}
+#endif
PHP_MINIT_FUNCTION(xdebug)
{
@@ -1487,7 +1489,7 @@ PHP_FUNCTION(xdebug_set_error_handler)
/*************************************************************************************************************************************/
#define T(offset) (*(temp_variable *)((char *) Ts + offset))
-static inline zval *get_zval(znode *node, temp_variable *Ts, int *is_var)
+static zval *get_zval(znode *node, temp_variable *Ts, int *is_var)
{
switch (node->op_type) {
case IS_CONST:
View
@@ -29,7 +29,7 @@
ZEND_EXTERN_MODULE_GLOBALS(xdebug)
-inline double get_mtimestamp()
+double get_mtimestamp()
{
struct timeval tv;
#ifdef HAVE_GETTIMEOFDAY
View
@@ -75,4 +75,5 @@ typedef struct xdebug_fs {
/* need to be export, since these are used by the xdebug.c code */
void print_profile(int html, int mode TSRMLS_DC);
-inline double get_mtimestamp();
+double get_mtimestamp();
+
View
@@ -28,7 +28,7 @@ ZEND_EXTERN_MODULE_GLOBALS(xdebug)
#define XDEBUG_STR_PREALLOC 1024
-void XDEBUG_STR_ADD(xdebug_str *xs, char *str, int f)
+inline void XDEBUG_STR_ADD(xdebug_str *xs, char *str, int f)
{
int l = strlen(str);
if (xs->l + l > xs->a - 1) {
@@ -46,7 +46,7 @@ void XDEBUG_STR_ADD(xdebug_str *xs, char *str, int f)
}
}
-void XDEBUG_STR_ADDL(xdebug_str *xs, char *str, int le, int f)
+inline void XDEBUG_STR_ADDL(xdebug_str *xs, char *str, int le, int f)
{
if (xs->l + le > xs->a - 1) {
xs->d = xdrealloc(xs->d, xs->a + le + XDEBUG_STR_PREALLOC);

0 comments on commit 4bf5687

Please sign in to comment.