Index: src/bin/initdb/Makefile
===================================================================
RCS file: /projects/cvsroot/pgsql-server/src/bin/initdb/Makefile,v
retrieving revision 1.35
diff -u -r1.35 Makefile
--- src/bin/initdb/Makefile	23 Dec 2003 21:56:20 -0000	1.35
+++ src/bin/initdb/Makefile	11 Apr 2004 19:21:20 -0000
@@ -20,7 +20,7 @@
 all: submake-libpq submake-libpgport initdb
 
 initdb: $(OBJS) $(libpq_builddir)/libpq.a
-	$(CC) $(CFLAGS) $(OBJS) $(libpq) $(LDFLAGS) $(LIBS) -o $@
+	$(CC) $(CFLAGS) $(OBJS) $(libpq) $(LDFLAGS) $(LIBS) -o $@$(X)
 
 install: all installdirs
 	$(INSTALL_PROGRAM) initdb$(X) $(DESTDIR)$(bindir)/initdb$(X)
Index: src/bin/pg_controldata/Makefile
===================================================================
RCS file: /projects/cvsroot/pgsql-server/src/bin/pg_controldata/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- src/bin/pg_controldata/Makefile	10 Feb 2004 23:24:13 -0000	1.5
+++ src/bin/pg_controldata/Makefile	11 Apr 2004 19:21:20 -0000
@@ -17,7 +17,7 @@
 all: submake-libpgport pg_controldata
 
 pg_controldata: $(OBJS)
-	$(CC) $(CFLAGS) $^ $(LDFLAGS) $(LIBS) -o $@
+	$(CC) $(CFLAGS) $^ $(LDFLAGS) $(LIBS) -o $@$(X)
 
 pg_crc.c: $(top_srcdir)/src/backend/utils/hash/pg_crc.c
 	rm -f $@ && $(LN_S) $< .
Index: src/bin/pg_dump/Makefile
===================================================================
RCS file: /projects/cvsroot/pgsql-server/src/bin/pg_dump/Makefile,v
retrieving revision 1.44
diff -u -r1.44 Makefile
--- src/bin/pg_dump/Makefile	7 Feb 2004 07:20:12 -0000	1.44
+++ src/bin/pg_dump/Makefile	11 Apr 2004 19:21:20 -0000
@@ -25,13 +25,13 @@
 all: submake-libpq submake-libpgport submake-backend pg_dump pg_restore pg_dumpall
 
 pg_dump: pg_dump.o common.o pg_dump_sort.o $(OBJS) $(libpq_builddir)/libpq.a 
-	$(CC) $(CFLAGS) pg_dump.o common.o pg_dump_sort.o $(OBJS) $(EXTRA_OBJS) $(libpq) $(LDFLAGS) $(LIBS) -o $@
+	$(CC) $(CFLAGS) pg_dump.o common.o pg_dump_sort.o $(OBJS) $(EXTRA_OBJS) $(libpq) $(LDFLAGS) $(LIBS) -o $@$(X)
 
 pg_restore: pg_restore.o $(OBJS) $(libpq_builddir)/libpq.a
-	$(CC) $(CFLAGS) pg_restore.o $(OBJS) $(EXTRA_OBJS) $(libpq) $(LDFLAGS) $(LIBS) -o $@
+	$(CC) $(CFLAGS) pg_restore.o $(OBJS) $(EXTRA_OBJS) $(libpq) $(LDFLAGS) $(LIBS) -o $@$(X)
 
 pg_dumpall: pg_dumpall.o dumputils.o $(libpq_builddir)/libpq.a
-	$(CC) $(CFLAGS) pg_dumpall.o dumputils.o $(EXTRA_OBJS) $(libpq) $(LDFLAGS) $(LIBS) -o $@
+	$(CC) $(CFLAGS) pg_dumpall.o dumputils.o $(EXTRA_OBJS) $(libpq) $(LDFLAGS) $(LIBS) -o $@$(X)
 
 .PHONY: submake-backend
 submake-backend:
Index: src/bin/pg_encoding/Makefile
===================================================================
RCS file: /projects/cvsroot/pgsql-server/src/bin/pg_encoding/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- src/bin/pg_encoding/Makefile	29 Nov 2003 19:52:05 -0000	1.16
+++ src/bin/pg_encoding/Makefile	11 Apr 2004 19:21:20 -0000
@@ -17,7 +17,7 @@
 all: submake-libpq submake-libpgport pg_encoding
 
 pg_encoding: $(OBJS)
-	$(CC) $(CFLAGS) $^ $(libpq) $(LDFLAGS) $(LIBS) -o $@
+	$(CC) $(CFLAGS) $^ $(libpq) $(LDFLAGS) $(LIBS) -o $@$(X)
 
 install: all installdirs
 	$(INSTALL_PROGRAM) pg_encoding$(X) $(DESTDIR)$(bindir)/pg_encoding$(X)
Index: src/bin/pg_resetxlog/Makefile
===================================================================
RCS file: /projects/cvsroot/pgsql-server/src/bin/pg_resetxlog/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- src/bin/pg_resetxlog/Makefile	5 Mar 2004 01:11:04 -0000	1.6
+++ src/bin/pg_resetxlog/Makefile	11 Apr 2004 19:21:20 -0000
@@ -20,7 +20,7 @@
 all: submake-libpgport pg_resetxlog
 
 pg_resetxlog: $(OBJS)
-	$(CC) $(CFLAGS) $^ $(LDFLAGS) $(LIBS) -o $@
+	$(CC) $(CFLAGS) $^ $(LDFLAGS) $(LIBS) -o $@$(X)
 
 dirmod.c: % : $(top_srcdir)/src/port/%
 	rm -f $@ && $(LN_S) $< .
Index: src/bin/psql/Makefile
===================================================================
RCS file: /projects/cvsroot/pgsql-server/src/bin/psql/Makefile,v
retrieving revision 1.40
diff -u -r1.40 Makefile
--- src/bin/psql/Makefile	9 Mar 2004 19:47:05 -0000	1.40
+++ src/bin/psql/Makefile	11 Apr 2004 19:21:20 -0000
@@ -27,7 +27,7 @@
 all: submake-libpq submake-libpgport psql
 
 psql: $(OBJS) $(libpq_builddir)/libpq.a
-	$(CC) $(CFLAGS) $(OBJS) $(libpq) $(LDFLAGS) $(LIBS) -o $@
+	$(CC) $(CFLAGS) $(OBJS) $(libpq) $(LDFLAGS) $(LIBS) -o $@$(X)
 
 help.o: $(srcdir)/sql_help.h
 
Index: src/bin/scripts/Makefile
===================================================================
RCS file: /projects/cvsroot/pgsql-server/src/bin/scripts/Makefile,v
retrieving revision 1.25
diff -u -r1.25 Makefile
--- src/bin/scripts/Makefile	29 Nov 2003 19:52:07 -0000	1.25
+++ src/bin/scripts/Makefile	11 Apr 2004 19:21:20 -0000
@@ -20,7 +20,7 @@
 all: submake-libpq submake-backend $(PROGRAMS)
 
 %: %.o
-	$(CC) $(CFLAGS) $^ $(libpq) $(LDFLAGS) $(LIBS) -o $@
+	$(CC) $(CFLAGS) $^ $(libpq) $(LDFLAGS) $(LIBS) -o $@$(X)
 
 createdb: createdb.o common.o dumputils.o $(top_builddir)/src/backend/parser/keywords.o
 createlang: createlang.o common.o print.o mbprint.o
Index: src/interfaces/ecpg/preproc/Makefile
===================================================================
RCS file: /projects/cvsroot/pgsql-server/src/interfaces/ecpg/preproc/Makefile,v
retrieving revision 1.99
diff -u -r1.99 Makefile
--- src/interfaces/ecpg/preproc/Makefile	2 Mar 2004 06:45:05 -0000	1.99
+++ src/interfaces/ecpg/preproc/Makefile	11 Apr 2004 19:21:21 -0000
@@ -25,7 +25,7 @@
 all: submake-libpgport ecpg
 
 ecpg: $(OBJS)
-	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(LIBS) $(THREAD_LIBS) -o $@
+	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(LIBS) $(THREAD_LIBS) -o $@$(X)
 
 # pgc is compiled as part of preproc
 preproc.o: $(srcdir)/pgc.c
Index: src/makefiles/Makefile.win32
===================================================================
RCS file: /projects/cvsroot/pgsql-server/src/makefiles/Makefile.win32,v
retrieving revision 1.3
diff -u -r1.3 Makefile.win32
--- src/makefiles/Makefile.win32	29 Nov 2003 19:52:12 -0000	1.3
+++ src/makefiles/Makefile.win32	11 Apr 2004 19:21:21 -0000
@@ -3,8 +3,13 @@
 # Use replacement include files for those missing on Win32
 override CPPFLAGS+="-I$(top_srcdir)/src/include/port/win32"
 
-DLLTOOL= dlltool
-DLLWRAP= dllwrap
+#DLLTOOL= dlltool
+#DLLWRAP= dllwrap
+DLLTOOL= mingw32-dlltool
+DLLWRAP= mingw32-dllwrap
+AR=mingw32-ar
+RANLIB=mingw32-ranlib
+YACC=/opt/bison1875/bin/bison -y
 BE_DLLLIBS= -L$(top_builddir)/src/backend -lpostgres
 DLLINIT = $(top_builddir)/src/utils/dllinit.o
 
Index: src/port/snprintf.c
===================================================================
RCS file: /projects/cvsroot/pgsql-server/src/port/snprintf.c,v
retrieving revision 1.3
diff -u -r1.3 snprintf.c
--- src/port/snprintf.c	8 Jan 2004 17:15:54 -0000	1.3
+++ src/port/snprintf.c	11 Apr 2004 19:21:22 -0000
@@ -40,7 +40,7 @@
 Your platform must have a thread-safe snprintf() to compile with threads.
 #endif
 
-#include <sys/ioctl.h>
+//#include <sys/ioctl.h>
 #include <sys/param.h>