diff -N -r -C3 --exclude=CVS ../pgsql_HEAD/src/include/libpq/pqcomm.h ./src/include/libpq/pqcomm.h
*** ../pgsql_HEAD/src/include/libpq/pqcomm.h	Mon Aug 27 20:43:58 2001
--- ./src/include/libpq/pqcomm.h	Mon Aug 27 20:46:56 2001
***************
*** 19,24 ****
--- 19,28 ----
  #include <sys/types.h>
  #ifdef WIN32
  #include <winsock.h>
+ /* workaround for clashing defines of "ERROR" */
+ #ifdef ELOG_H
+ #define ERROR	(-1)
+ #endif
  #else							/* not WIN32 */
  #include <sys/socket.h>
  #ifdef HAVE_SYS_UN_H