diff --git a/compat/ttydefaults.h b/compat/ttydefaults.h
index 9e98fa4e..1bb942d2 100644
--- a/compat/ttydefaults.h
+++ b/compat/ttydefaults.h
@@ -1,4 +1,4 @@
-/* $Id: ttydefaults.h,v 1.2 2009-08-20 12:27:58 nicm Exp $ */
+/* $Id: ttydefaults.h,v 1.3 2009-08-20 12:38:37 nicm Exp $ */
 /*	$OpenBSD: ttydefaults.h,v 1.6 2003/06/02 23:28:22 millert Exp $	*/
 /*	$NetBSD: ttydefaults.h,v 1.8 1996/04/09 20:55:45 cgd Exp $	*/
 
@@ -56,6 +56,7 @@
 /*
  * Control Character Defaults
  */
+#undef CTRL
 #define CTRL(x)	(x&037)
 #ifndef CEOF
 #define	CEOF		CTRL('d')
diff --git a/configure b/configure
index b56f2ce6..9ff4e636 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: configure,v 1.28 2009-08-20 12:25:17 nicm Exp $
+# $Id: configure,v 1.29 2009-08-20 12:38:37 nicm Exp $
 
 TMUX_PLATFORM=${TMUX_PLATFORM:-`uname -s`}
 
@@ -141,6 +141,7 @@ EOF
 CPPFLAGS+= -I/usr/local/include/ncurses \
 	-I/opt/csw/include -I/opt/csw/include/ncurses \
 	-I/opt/sfw/include -I/opt/sfw/include/ncurses
+CFLAGS+= -D_XPG4_2 -D__EXTENSIONS__
 LDFLAGS+= -L/usr/gnu/lib \
 	-L/opt/csw/lib \
 	-L/opt/sfw/lib