Browse Source

build with vc6 by fixing TRAC va_arg

git-svn-id: svn://svn.lighttpd.net/xcache/trunk@349 c26eb9a1-5813-0410-bd6c-c2e55f420ca7
3.0
Xuefer 15 years ago
parent
commit
5a15696e8a
  1. 8
      utils.c
  2. 34
      utils.h

8
utils.c

@ -729,17 +729,17 @@ void xc_sandbox_free(xc_sandbox_t *sandbox, int install TSRMLS_DC) /* {{{ */
/* }}} */
int xc_vtrace(const char *fmt, va_list args) /* {{{ */
{
vfprintf(stderr, fmt, args);
return 0;
return vfprintf(stderr, fmt, args);
}
/* }}} */
int xc_trace(const char *fmt, ...) /* {{{ */
{
va_list args;
int ret;
va_start(args, fmt);
xc_vtrace(fmt, args);
ret = xc_vtrace(fmt, args);
va_end(args);
return 0;
return ret;
}
/* }}} */

34
utils.h

@ -3,19 +3,43 @@
#ifdef DEBUG
# define IFDEBUG(x) (x)
# define TRACE(fmt, ...) \
xc_trace("%s:%d: " fmt "\r\n", __FILE__, __LINE__, __VA_ARGS__)
int xc_vtrace(const char *fmt, va_list args);
int xc_trace(const char *fmt, ...) ZEND_ATTRIBUTE_PTR_FORMAT(printf, 1, 2);
# ifdef ZEND_WIN32
static inline int TRACE(const char *fmt, ...)
{
va_list args;
int ret;
va_start(args, fmt);
ret = xc_vtrace(fmt, args);
va_end(args);
return ret;
}
# else
# define TRACE(fmt, ...) \
xc_trace("%s:%d: " fmt "\r\n", __FILE__, __LINE__, __VA_ARGS__)
# endif /* ZEND_WIN32 */
# undef NDEBUG
# undef inline
# define inline
#else
# define TRACE(fmt, ...) do { } while (0)
#else /* DEBUG */
# ifdef ZEND_WIN32
static inline int TRACE(const char *fmt, ...)
{
return 0;
}
# else
# define TRACE(fmt, ...) do { } while (0)
# endif /* ZEND_WIN32 */
# define IFDEBUG(x) do { } while (0)
# ifndef NDEBUG
# define NDEBUG
# endif
#endif
#endif /* DEBUG */
#include <assert.h>
typedef struct {

Loading…
Cancel
Save