[Python-checkins] r86367 - in python/branches/py3k-cdecimal/Modules/cdecimal: mpdecimal32.h mpdecimal64.h
stefan.krah
python-checkins at python.org
Tue Nov 9 21:01:55 CET 2010
Author: stefan.krah
Date: Tue Nov 9 21:01:54 2010
New Revision: 86367
Log:
The last construct failed with Visual Studio.
Modified:
python/branches/py3k-cdecimal/Modules/cdecimal/mpdecimal32.h
python/branches/py3k-cdecimal/Modules/cdecimal/mpdecimal64.h
Modified: python/branches/py3k-cdecimal/Modules/cdecimal/mpdecimal32.h
==============================================================================
--- python/branches/py3k-cdecimal/Modules/cdecimal/mpdecimal32.h (original)
+++ python/branches/py3k-cdecimal/Modules/cdecimal/mpdecimal32.h Tue Nov 9 21:01:54 2010
@@ -573,11 +573,14 @@
/******************************************************************************/
#define mpd_err_fatal(...) \
- do {mpd_varerr("%s:%d: error: ", __VA_ARGS__, ""); exit(1);} while (0)
+ do {fprintf(stderr, "%s:%d: error: ", __FILE__, __LINE__); \
+ fprintf(stderr, __VA_ARGS__); fputc('\n', stderr); \
+ exit(1); \
+ } while (0)
#define mpd_err_warn(...) \
- mpd_varerr("%s:%d: warning: ", __VA_ARGS__, "")
-#define mpd_varerr(intro, format, ...) \
- fprintf(stderr, intro format "%s\n", __FILE__, __LINE__, __VA_ARGS__)
+ do {fprintf(stderr, "%s:%d: warning: ", __FILE__, __LINE__); \
+ fprintf(stderr, __VA_ARGS__); fputc('\n', stderr); \
+ } while (0)
/******************************************************************************/
Modified: python/branches/py3k-cdecimal/Modules/cdecimal/mpdecimal64.h
==============================================================================
--- python/branches/py3k-cdecimal/Modules/cdecimal/mpdecimal64.h (original)
+++ python/branches/py3k-cdecimal/Modules/cdecimal/mpdecimal64.h Tue Nov 9 21:01:54 2010
@@ -588,11 +588,14 @@
/******************************************************************************/
#define mpd_err_fatal(...) \
- do {mpd_varerr("%s:%d: error: ", __VA_ARGS__, ""); exit(1);} while (0)
+ do {fprintf(stderr, "%s:%d: error: ", __FILE__, __LINE__); \
+ fprintf(stderr, __VA_ARGS__); fputc('\n', stderr); \
+ exit(1); \
+ } while (0)
#define mpd_err_warn(...) \
- mpd_varerr("%s:%d: warning: ", __VA_ARGS__, "")
-#define mpd_varerr(intro, format, ...) \
- fprintf(stderr, intro format "%s\n", __FILE__, __LINE__, __VA_ARGS__)
+ do {fprintf(stderr, "%s:%d: warning: ", __FILE__, __LINE__); \
+ fprintf(stderr, __VA_ARGS__); fputc('\n', stderr); \
+ } while (0)
/******************************************************************************/
More information about the Python-checkins
mailing list