Update this branch to match CVS head, includes WIN32 improvements.

2 files changed, 4 insertions, 3 deletions

diff --git a/src/interfaces/ecpg/test/test1.pgc b/src/interfaces/ecpg/test/test1.pgc
index 05fcda0ca9e..753c0abae5d 100644
--- a/src/interfaces/ecpg/test/test1.pgc
+++ b/src/interfaces/ecpg/test/test1.pgc
@@ -52,6 +52,7 @@ exec sql endif;
 	char command[128];
 	char *connection="pm";
 	int how_many;
+	char *user="postgres";
 exec sql end declare section;
 	exec sql var name is string[AMOUNT];
 	char msg[128];
@@ -65,7 +66,7 @@ exec sql end declare section;
 	exec sql connect to mm as main;
 
 	strcpy(msg, "connect");
-        exec sql connect to pm;
+        exec sql connect to pm user :user;
 
 	strcpy(msg, "create");
 	exec sql at main create table "Test" (name char(NAMELEN), amount int, letter char(1));
diff --git a/src/interfaces/ecpg/test/test_thread.pgc b/src/interfaces/ecpg/test/test_thread.pgc
index 8d9eac2926a..44769f68125 100644
--- a/src/interfaces/ecpg/test/test_thread.pgc
+++ b/src/interfaces/ecpg/test/test_thread.pgc
@@ -48,8 +48,8 @@ EXEC SQL END DECLARE SECTION;
 	EXEC SQL AT test0 COMMIT WORK;
 	EXEC SQL DISCONNECT test0;
 
-	pthread_create(&thread1, NULL, (void *) ins1, NULL);
-	pthread_create(&thread2, NULL, (void *) ins2, NULL);
+	pthread_create(&thread1, NULL, (void * (*)(void *)) ins1, NULL);
+	pthread_create(&thread2, NULL, (void * (*)(void *)) ins2, NULL);
 	pthread_join(thread1, NULL);
 	pthread_join(thread2, NULL);