From d14cc5361f7db7016b7cbb1cc59d8500101d9f27 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 5 Jul 2016 10:16:00 +0200 Subject: doc/_attic_/: Introduce an "_attic_" folder. Move diffs between NoMachine's nx-X11 3.5 and X.org 6.9 here. --- .../nx-X11_programs_xterm_main.c.X.original | 42 ---------------------- 1 file changed, 42 deletions(-) delete mode 100644 doc/nx-X11_vs_XOrg69_patches/nx-X11_programs_xterm_main.c.X.original (limited to 'doc/nx-X11_vs_XOrg69_patches/nx-X11_programs_xterm_main.c.X.original') diff --git a/doc/nx-X11_vs_XOrg69_patches/nx-X11_programs_xterm_main.c.X.original b/doc/nx-X11_vs_XOrg69_patches/nx-X11_programs_xterm_main.c.X.original deleted file mode 100644 index 2ee26838e..000000000 --- a/doc/nx-X11_vs_XOrg69_patches/nx-X11_programs_xterm_main.c.X.original +++ /dev/null @@ -1,42 +0,0 @@ ---- ./nx-X11/programs/xterm/main.c.X.original 2015-02-13 14:03:44.804440330 +0100 -+++ ./nx-X11/programs/xterm/main.c 2015-02-13 14:03:44.804440330 +0100 -@@ -91,8 +91,39 @@ - - ******************************************************************/ - -+/**************************************************************************/ -+/* */ -+/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ -+/* */ -+/* NX-X11, NX protocol compression and NX extensions to this software */ -+/* are copyright of NoMachine. Redistribution and use of the present */ -+/* software is allowed according to terms specified in the file LICENSE */ -+/* which comes in the source distribution. */ -+/* */ -+/* Check http://www.nomachine.com/licensing.html for applicability. */ -+/* */ -+/* NX and NoMachine are trademarks of Medialogic S.p.A. */ -+/* */ -+/* All rights reserved. */ -+/* */ -+/**************************************************************************/ -+ - /* $XFree86: xc/programs/xterm/main.c,v 3.199 2005/11/13 23:10:36 dickey Exp $ */ - -+#ifdef NX_TRANS_EXIT -+ -+/* -+ * Redefine the libc exit() function to be -+ * sure we get rid of proxy and detect any -+ * abnormal termination. -+ */ -+ -+extern void NXTransExit(int code) __attribute__((noreturn)); -+ -+#define exit(code) NXTransExit(code) -+ -+#endif /* #ifdef NX_TRANS_EXIT */ -+ - /* main.c */ - - #define RES_OFFSET(field) XtOffsetOf(XTERM_RESOURCE, field) -- cgit v1.2.3