--- rxvt-unicode/src/ptytty.C	2004/02/13 12:16:21	1.6
+++ rxvt-unicode/src/ptytty.C	2004/08/13 03:36:57	1.12
@@ -1,9 +1,10 @@
 /*--------------------------------*-C-*---------------------------------*
- * File:	ptytty.c
+ * File:	ptytty.C
  *----------------------------------------------------------------------*
  *
  * All portions of code are copyright by their respective author/s.
  * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com>
+ * Copyright (c) 2004      Marc Lehmann <pcg@goof.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,9 +27,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 +44,7 @@
 # include <unistd.h>
 #endif
 #if defined(HAVE_STRING_H)
-# include <string.h>
+# include <cstring>
 #endif
 #ifdef HAVE_FCNTL_H
 # include <fcntl.h>
@@ -45,9 +52,12 @@
 #ifdef HAVE_SYS_IOCTL_H
 # include <sys/ioctl.h>
 #endif
-#if defined(PTYS_ARE_PTMX) && !defined(__CYGWIN32__)
+#if defined(PTYS_ARE_PTMX) && defined(HAVE_SYS_STROPTS_H)
 # 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)