*** original/pgsql/src/include/utils/elog.h	2012-11-06 02:11:02.960963602 +0900
--- new/pgsql/src/include/utils/elog.h	2012-11-06 02:11:02.888953895 +0900
***************
*** 109,114 ****
--- 109,117 ----
  #define ereport(elevel, rest)	\
  	ereport_domain(elevel, TEXTDOMAIN, rest)
  
+ #define errcontext(...)	\
+ 	errcontext_domain(TEXTDOMAIN, __VA_ARGS__)
+ 
  #define TEXTDOMAIN NULL
  
  extern bool errstart(int elevel, const char *filename, int lineno,
***************
*** 173,182 ****
  __attribute__((format(PG_PRINTF_ATTRIBUTE, 1, 2)));
  
  extern int
! errcontext(const char *fmt,...)
  /* This extension allows gcc to check the format string for consistency with
     the supplied arguments. */
! __attribute__((format(PG_PRINTF_ATTRIBUTE, 1, 2)));
  
  extern int	errhidestmt(bool hide_stmt);
  
--- 176,185 ----
  __attribute__((format(PG_PRINTF_ATTRIBUTE, 1, 2)));
  
  extern int
! errcontext_domain(const char *domain, const char *fmt,...)
  /* This extension allows gcc to check the format string for consistency with
     the supplied arguments. */
! __attribute__((format(PG_PRINTF_ATTRIBUTE, 2, 3)));
  
  extern int	errhidestmt(bool hide_stmt);