Index: include/c.h
===================================================================
RCS file: c:/prog/cvsrepo/pgsql/pgsql/src/include/c.h,v
retrieving revision 1.212
diff -c -r1.212 c.h
*** include/c.h	3 Oct 2006 03:59:22 -0000	1.212
--- include/c.h	3 Oct 2006 18:34:21 -0000
***************
*** 58,65 ****
  #include "postgres_ext.h"
  #include "pg_trace.h"
  
! #if defined(__BORLANDC__) || (_MSC_VER > 1400)
  #include <crtdefs.h>
  #endif
  
  #include <stdio.h>
--- 58,67 ----
  #include "postgres_ext.h"
  #include "pg_trace.h"
  
! #if defined(__BORLANDC__) || (_MSC_VER >= 1400)
! #define errcode __msvc_errcode
  #include <crtdefs.h>
+ #undef errcode
  #endif
  
  #include <stdio.h>
Index: include/port/win32.h
===================================================================
RCS file: c:/prog/cvsrepo/pgsql/pgsql/src/include/port/win32.h,v
retrieving revision 1.60
diff -c -r1.60 win32.h
*** include/port/win32.h	3 Oct 2006 03:59:22 -0000	1.60
--- include/port/win32.h	3 Oct 2006 18:30:18 -0000
***************
*** 272,280 ****
  #define inline __inline
  #define __inline__ __inline
  
- #undef errcode
- #define errcode __msvc_errcode
- 
  #define _S_IRWXU	(_S_IREAD | _S_IWRITE | _S_IEXEC)
  #define _S_IXUSR	_S_IEXEC
  #define _S_IWUSR	_S_IWRITE
--- 272,277 ----