--- xtest/xts5/configs/tetbuild.cfg.Linux	2006-08-28 08:57:30.000000000 +0800
+++ xtest/xts5/configs/tetbuild.cfg.Linux.new	2006-08-28 08:58:59.000000000 +0800
@@ -368,7 +368,7 @@
 # AIXV3	: XP_DEFINES=-D_XOPEN_SOURCE -D_ALL_SOURCE -DNeedFunctionPrototypes=1
 # SVR4	: XP_DEFINES=-DNeedFunctionPrototypes=1 -D_XOPEN_SOURCE
 # OSF1	: XT_DEFINES=-D_XOPEN_SOURCE_EXTENDED -DNeedFunctionPrototypes=1 -DXTESTEXTENSION
-XT_DEFINES=-D_XOPEN_SOURCE -DXTESTEXTENSION -D_GNU_SOURCE
+XT_DEFINES=-D_XOPEN_SOURCE -DXTESTEXTENSION -D_GNU_SOURCE -DMIXOLDANDNEW
 
 # LINKOBJOPTS - options to give to the LD program to link object
 # files together into one object file that can be further linked.
--- xtest/xts5/include/XtTestProto.h	2006-08-28 08:52:48.000000000 +0800
+++ xtest/xts5/include/XtTestProto.h.new	2006-08-25 16:47:00.000000000 +0800
@@ -129,9 +129,9 @@
 Widget	CreateMenuShellWidget(Widget);
 Widget	CreateDialogShellWidget(Widget);
 Window	avs_xext_init(void);
-int	avs_xext_close(void);
-int	check_dec(int, int, char*);
-int	check_not_dec(int, int, char*);
+void 	avs_xext_close(void);
+int	check_dec(long, long, char*);
+int	check_not_dec(long, long, char*);
 int	check_str(char *, char *, char *);
 int	check_char(char, char, char *);
 int	check_size(char *, char *, size_t, size_t);
--- xtest/xts5/src/libXtTest/check.c	2005-11-03 16:42:02.000000000 +0800
+++ xtest/xts5/src/libXtTest/check.c.new	2006-08-28 08:46:21.000000000 +0800
@@ -74,7 +74,7 @@
 char *item_name;
 {
 	if (goesin != shouldbe) {
-		sprintf(ebuf, "ERROR: Expected %s of %d, Received %d", item_name, goesin, shouldbe);
+		sprintf(ebuf, "ERROR: Expected %s of %ld, Received %ld", item_name, goesin, shouldbe);
 		tet_infoline(ebuf);
 		tet_result(TET_FAIL);
 		return 1;
@@ -88,7 +88,7 @@
 char *item_name;
 {
 	if (goesin == shouldnotbe) {
-		sprintf(ebuf, "ERROR: Expected %s not = %d, received %d", item_name, goesin, shouldnotbe);
+		sprintf(ebuf, "ERROR: Expected %s not = %ld, received %ld", item_name, goesin, shouldnotbe);
 		tet_infoline(ebuf);
 		tet_result(TET_FAIL);
 		return 1;