cherokee at cherokee-project
Nov 20, 2009, 2:14 AM
Post #1 of 1
(111 views)
Permalink
|
|
[3848] cherokee/trunk/cherokee: Fixes the __VA_ARGS__ usage, so Cherokee can be compiled with recent
|
|
Revision: 3848
http://svn.cherokee-project.com/changeset/3848
Author: alo
Date: 2009-11-20 11:14:07 +0100 (Fri, 20 Nov 2009)
Log Message:
-----------
Fixes the __VA_ARGS__ usage, so Cherokee can be compiled with recent
versions of Sun Studio. Thanks to puccia (Google Code) for the patch!
Fixes #634: http://bugs.cherokee-project.com/634
Modified Paths:
--------------
cherokee/trunk/cherokee/error_log.h
cherokee/trunk/cherokee/macros.h
Modified: cherokee/trunk/cherokee/error_log.h
===================================================================
--- cherokee/trunk/cherokee/error_log.h 2009-11-20 09:28:51 UTC (rev 3847)
+++ cherokee/trunk/cherokee/error_log.h 2009-11-20 10:14:07 UTC (rev 3848)
@@ -50,7 +50,7 @@
#define CHEROKEE_ERROR(x) ((cherokee_error_t *)(x))
-#ifdef __GNUC__
+#if defined(__GNUC__) || ( defined(__SUNPRO_C) && __SUNPRO_C > 0x590 )
# define LOG_WARNING(e_num,arg...) cherokee_error_log (cherokee_err_warning, __FILE__, __LINE__, e_num, ##arg)
# define LOG_WARNING_S(e_num) cherokee_error_log (cherokee_err_warning, __FILE__, __LINE__, e_num)
# define LOG_ERROR(e_num,arg...) cherokee_error_log (cherokee_err_error, __FILE__, __LINE__, e_num, ##arg)
Modified: cherokee/trunk/cherokee/macros.h
===================================================================
--- cherokee/trunk/cherokee/macros.h 2009-11-20 09:28:51 UTC (rev 3847)
+++ cherokee/trunk/cherokee/macros.h 2009-11-20 10:14:07 UTC (rev 3848)
@@ -282,7 +282,7 @@
/* Printing macros
*/
-#ifdef __GNUC__
+#if defined(__GNUC__) || ( defined(__SUNPRO_C) && __SUNPRO_C > 0x590 )
# define PRINT_MSG(fmt,arg...) fprintf(stderr, fmt, ##arg)
# define PRINT_ERROR(fmt,arg...) fprintf(stderr, "%s:%d - "fmt, __FILE__, __LINE__, ##arg)
#else
|
