1*** gnulib/lib/error.h 2012-12-24 20:10:43.000000000 +0900 2--- srclib/error.h 2012-12-24 20:08:16.000000000 +0900 3*************** 4*** 31,36 **** 5--- 31,45 ---- 6 # define _GL_ATTRIBUTE_FORMAT(spec) /* empty */ 7 #endif 8 9+ #if GNULIB_REPLACE_ERROR 10+ # undef error_print_progname 11+ # undef error_message_count 12+ # undef error_one_per_line 13+ # define error_print_progname rpl_error_print_progname 14+ # define error_message_count rpl_error_message_count 15+ # define error_one_per_line rpl_error_one_per_line 16+ #endif 17+ 18 #ifdef __cplusplus 19 extern "C" { 20 #endif 21*************** 22*** 49,62 **** 23 /* If NULL, error will flush stdout, then print on stderr the program 24 name, a colon and a space. Otherwise, error will call this 25 function without parameters instead. */ 26! extern void (*error_print_progname) (void); 27 28 /* This variable is incremented each time 'error' is called. */ 29! extern unsigned int error_message_count; 30 31 /* Sometimes we want to have at most one error per line. This 32 variable controls whether this mode is selected or not. */ 33! extern int error_one_per_line; 34 35 #ifdef __cplusplus 36 } 37--- 58,71 ---- 38 /* If NULL, error will flush stdout, then print on stderr the program 39 name, a colon and a space. Otherwise, error will call this 40 function without parameters instead. */ 41! extern DLL_VARIABLE void (*error_print_progname) (void); 42 43 /* This variable is incremented each time 'error' is called. */ 44! extern DLL_VARIABLE unsigned int error_message_count; 45 46 /* Sometimes we want to have at most one error per line. This 47 variable controls whether this mode is selected or not. */ 48! extern DLL_VARIABLE int error_one_per_line; 49 50 #ifdef __cplusplus 51 } 52