From 9af51e470791639995bb34bd3198014dc11e2fef Mon Sep 17 00:00:00 2001
From: rpj <rpj>
Date: Thu, 12 Aug 1999 01:32:02 +0000
Subject: Merged patches to main trunk.

---
 tests/ChangeLog | 4 ++++
 tests/Makefile  | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 22b7028..4140f0c 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+Mon May 31 10:25:01 1999  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>
+
+	* Makefile (GLANG): Add GCC language option.
+
 Sat May 29 23:29:04 1999  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>
 
 	* runall.bat (condvar5): Add new test.
diff --git a/tests/Makefile b/tests/Makefile
index f96d830..7a348ab 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -11,8 +11,9 @@ ECHO	= @echo
 #
 # Mingw32
 #
+GLANG	= c
 CC	= gcc
-CFLAGS	= -g -O2 -UNDEBUG -Wall -o $@ $^
+CFLAGS	= -g -O2 -UNDEBUG -Wall -x $(GLANG) -o $@ $^
 BUILD_DIR	= ..
 INCLUDES	= -I.
 LIBS	= ./libpthread32.a
-- 
cgit v1.2.3