Module Name: xsrc
Committed By: mrg
Date: Sun Nov 21 01:19:31 UTC 2010
Modified Files:
xsrc/external/mit/xconsole/dist: xconsole.c
Removed Files:
xsrc/external/mit/font-util/dist: AUTHORS NEWS bdftruncate.man
fontutil.m4 ucs2any.man
xsrc/external/mit/xauth/dist: AUTHORS NEWS
xsrc/external/mit/xclipboard/dist: AUTHORS NEWS
xsrc/external/mit/xclock/dist: AUTHORS NEWS
xsrc/external/mit/xconsole/dist: AUTHORS NEWS XConsole.ad
xsrc/external/mit/xdpyinfo/dist: AUTHORS NEWS
xsrc/external/mit/xdriinfo/dist: NEWS
xsrc/external/mit/xedit/dist: NEWS print.c print.h printdialog.c
printdialog.h printdialogprivates.h
xsrc/external/mit/xedit/dist/app-defaults: Xedit-color.ad
Xedit-noxprint.ad Xedit-xprint.ad
xsrc/external/mit/xev/dist: AUTHORS NEWS
xsrc/external/mit/xf86dga/dist: AUTHORS NEWS compile
xsrc/external/mit/xfd/dist: AUTHORS NEWS Xfd.ad compile mkinstalldirs
xsrc/external/mit/xfontsel/dist: AUTHORS NEWS XFontSel.ad autogen.sh
compile
xsrc/external/mit/xfs/dist: AUTHORS NEWS acinclude.m4 config.cpp
xfs.man
xsrc/external/mit/xfs/dist/doc: xfs-design.css xfs-design.xsl
xsrc/external/mit/xfsinfo/dist: AUTHORS NEWS compile
Log Message:
merge cornflakes.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/font-util/dist/AUTHORS \
xsrc/external/mit/font-util/dist/NEWS \
xsrc/external/mit/font-util/dist/bdftruncate.man \
xsrc/external/mit/font-util/dist/ucs2any.man
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/font-util/dist/fontutil.m4
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xauth/dist/AUTHORS \
xsrc/external/mit/xauth/dist/NEWS
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xclipboard/dist/AUTHORS \
xsrc/external/mit/xclipboard/dist/NEWS
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xclock/dist/AUTHORS \
xsrc/external/mit/xclock/dist/NEWS
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xconsole/dist/AUTHORS \
xsrc/external/mit/xconsole/dist/NEWS \
xsrc/external/mit/xconsole/dist/XConsole.ad
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xconsole/dist/xconsole.c
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xdpyinfo/dist/AUTHORS \
xsrc/external/mit/xdpyinfo/dist/NEWS
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xdriinfo/dist/NEWS
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xedit/dist/NEWS \
xsrc/external/mit/xedit/dist/print.c xsrc/external/mit/xedit/dist/print.h \
xsrc/external/mit/xedit/dist/printdialog.c \
xsrc/external/mit/xedit/dist/printdialog.h \
xsrc/external/mit/xedit/dist/printdialogprivates.h
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xedit/dist/app-defaults/Xedit-color.ad \
xsrc/external/mit/xedit/dist/app-defaults/Xedit-noxprint.ad \
xsrc/external/mit/xedit/dist/app-defaults/Xedit-xprint.ad
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xev/dist/AUTHORS \
xsrc/external/mit/xev/dist/NEWS
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xf86dga/dist/AUTHORS \
xsrc/external/mit/xf86dga/dist/NEWS \
xsrc/external/mit/xf86dga/dist/compile
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xfd/dist/AUTHORS \
xsrc/external/mit/xfd/dist/NEWS xsrc/external/mit/xfd/dist/Xfd.ad \
xsrc/external/mit/xfd/dist/compile \
xsrc/external/mit/xfd/dist/mkinstalldirs
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xfontsel/dist/AUTHORS \
xsrc/external/mit/xfontsel/dist/NEWS \
xsrc/external/mit/xfontsel/dist/XFontSel.ad \
xsrc/external/mit/xfontsel/dist/autogen.sh \
xsrc/external/mit/xfontsel/dist/compile
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xfs/dist/AUTHORS \
xsrc/external/mit/xfs/dist/NEWS
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xfs/dist/acinclude.m4 \
xsrc/external/mit/xfs/dist/config.cpp xsrc/external/mit/xfs/dist/xfs.man
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xfs/dist/doc/xfs-design.css \
xsrc/external/mit/xfs/dist/doc/xfs-design.xsl
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xfsinfo/dist/AUTHORS \
xsrc/external/mit/xfsinfo/dist/NEWS \
xsrc/external/mit/xfsinfo/dist/compile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xconsole/dist/xconsole.c
diff -u xsrc/external/mit/xconsole/dist/xconsole.c:1.2 xsrc/external/mit/xconsole/dist/xconsole.c:1.3
--- xsrc/external/mit/xconsole/dist/xconsole.c:1.2 Wed Jul 30 17:18:59 2008
+++ xsrc/external/mit/xconsole/dist/xconsole.c Sun Nov 21 01:19:29 2010
@@ -66,10 +66,10 @@
#include <ctype.h>
#include <stdlib.h>
#ifdef HAS_OPENPTY
-# ifdef HAS_UTIL_H
+# ifdef HAVE_UTIL_H
# include <util.h>
# endif
-# ifdef HAS_PTY_H
+# ifdef HAVE_PTY_H
# include <pty.h>
# endif
#endif
@@ -182,7 +182,9 @@
# endif
# if defined (SVR4) || defined (USE_PTS)
# include <termios.h>
+# ifndef HAS_OPENPTY
# include <sys/stropts.h> /* for I_PUSH */
+# endif
# ifdef sun
# include <sys/strredir.h>
# endif
