diff --git a/src/support/ChangeLog b/src/support/ChangeLog
index 573742700c..099ae47cca 100644
--- a/src/support/ChangeLog
+++ b/src/support/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-15  Angus Leeming  <a.leeming@ic.ac.uk>
+
+	* tempname.C (make_tempfile): simplify the #ifdef block by using
+	#if defined and re-write the #warning as a #error because it's terminal.
+
 2002-04-08  Herbert Voss  <voss@perce.de>
 
 	* filetools.C (getExtFromContents): get tgif run 
diff --git a/src/support/tempname.C b/src/support/tempname.C
index 88f142bac4..f15ec1a6f0 100644
--- a/src/support/tempname.C
+++ b/src/support/tempname.C
@@ -18,18 +18,14 @@ namespace {
 inline
 int make_tempfile(char * templ)
 {
-#ifdef HAVE_MKSTEMP
+#if defined(HAVE_MKSTEMP)
 	return ::mkstemp(templ);
-#else
-#ifdef HAVE_MKTEMP
+#elif defined(HAVE_MKTEMP)
 	// This probably just barely works...
 	::mktemp(templ);
 	return ::open(templ, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
 #else
-#ifdef WITH_WARNINGS
-#warning FIX FIX FIX
-#endif
-#endif
+#error FIX FIX FIX
 #endif
 }