--- rxvt-unicode/src/ptytty.C	2004/02/13 12:16:21	1.6
+++ rxvt-unicode/src/ptytty.C	2004/04/02 20:41:01	1.10
@@ -26,9 +26,15 @@
  * Try to be self-contained except for the above autoconfig'd defines
  */
 
-#include <stdio.h>
+#if 0
+#ifdef HAVE_GETPT
+# define _GNU_SOURCE
+#endif
+#endif
+
+#include <cstdio>
 #ifdef HAVE_STDLIB_H
-# include <stdlib.h>
+# include <cstdlib>
 #endif
 #ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
@@ -37,7 +43,7 @@
 # include <unistd.h>
 #endif
 #if defined(HAVE_STRING_H)
-# include <string.h>
+# include <cstring>
 #endif
 #ifdef HAVE_FCNTL_H
 # include <fcntl.h>
@@ -48,6 +54,9 @@
 #if defined(PTYS_ARE_PTMX) && !defined(__CYGWIN32__)
 # include <sys/stropts.h>      /* for I_PUSH */
 #endif
+#ifdef HAVE_ISASTREAM
+# include <stropts.h>
+#endif
 
 #ifdef DEBUG_TTY
 # define D_TTY(x)		fprintf x ; fputc('\n', stderr) ; fflush(stderr)