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. --- ...11_programs_Xserver_randr_registry.h.X.original | 67 ---------------------- 1 file changed, 67 deletions(-) delete mode 100644 doc/nx-X11_vs_XOrg69_patches/nx-X11_programs_Xserver_randr_registry.h.X.original (limited to 'doc/nx-X11_vs_XOrg69_patches/nx-X11_programs_Xserver_randr_registry.h.X.original') diff --git a/doc/nx-X11_vs_XOrg69_patches/nx-X11_programs_Xserver_randr_registry.h.X.original b/doc/nx-X11_vs_XOrg69_patches/nx-X11_programs_Xserver_randr_registry.h.X.original deleted file mode 100644 index 601bc0a98..000000000 --- a/doc/nx-X11_vs_XOrg69_patches/nx-X11_programs_Xserver_randr_registry.h.X.original +++ /dev/null @@ -1,67 +0,0 @@ ---- ./nx-X11/programs/Xserver/randr/registry.h.X.original 2015-02-13 14:03:44.792440567 +0100 -+++ ./nx-X11/programs/Xserver/randr/registry.h 2015-02-10 19:13:13.616692925 +0100 -@@ -0,0 +1,64 @@ -+/*********************************************************** -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ -+******************************************************************/ -+ -+#ifndef DIX_REGISTRY_H -+#define DIX_REGISTRY_H -+ -+/* -+ * Result returned from any unsuccessful lookup -+ */ -+#define XREGISTRY_UNKNOWN "" -+ -+#ifdef XREGISTRY -+ -+#include "resource.h" -+#include "extnsionst.h" -+ -+/* Internal string registry - for auditing, debugging, security, etc. */ -+ -+/* -+ * Registration functions. The name string is not copied, so it must -+ * not be a stack variable. -+ */ -+void RegisterResourceName(RESTYPE type, char *name); -+void RegisterExtensionNames(ExtensionEntry *ext); -+ -+/* -+ * Lookup functions. The returned string must not be modified or freed. -+ */ -+const char *LookupMajorName(int major); -+const char *LookupRequestName(int major, int minor); -+const char *LookupEventName(int event); -+const char *LookupErrorName(int error); -+const char *LookupResourceName(RESTYPE rtype); -+ -+/* -+ * Setup and teardown -+ */ -+void dixResetRegistry(void); -+ -+#else /* XREGISTRY */ -+ -+/* Define calls away when the registry is not being built. */ -+ -+#define RegisterResourceName(a, b) { ; } -+#define RegisterExtensionNames(a) { ; } -+ -+#define LookupMajorName(a) XREGISTRY_UNKNOWN -+#define LookupRequestName(a, b) XREGISTRY_UNKNOWN -+#define LookupEventName(a) XREGISTRY_UNKNOWN -+#define LookupErrorName(a) XREGISTRY_UNKNOWN -+#define LookupResourceName(a) XREGISTRY_UNKNOWN -+ -+#define dixResetRegistry() { ; } -+ -+#endif /* XREGISTRY */ -+#endif /* DIX_REGISTRY_H */ -- cgit v1.2.3