[xsrc/trunk]: xsrc/external/mit/xorg-server/dist fix a couple of merge botche...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/xsrc/rev/e25c7625eb98
branches:  trunk
changeset: 7290:e25c7625eb98
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Dec 19 19:37:36 2022 +0000

description:
fix a couple of merge botches (duplicated) delete #if 0'd sections.

reduces diffs vs upstream.

diffstat:

 external/mit/xorg-server/dist/Xi/sendexev.c              |   3 ---
 external/mit/xorg-server/dist/hw/xfree86/int10/generic.c |   6 ------
 external/mit/xorg-server/dist/include/dix-config.h.in    |   3 ---
 external/mit/xorg-server/dist/include/os.h               |  10 ----------
 4 files changed, 0 insertions(+), 22 deletions(-)

diffs (62 lines):

diff -r b349dd95c9ae -r e25c7625eb98 external/mit/xorg-server/dist/Xi/sendexev.c
--- a/external/mit/xorg-server/dist/Xi/sendexev.c       Mon Dec 19 14:15:09 2022 +0000
+++ b/external/mit/xorg-server/dist/Xi/sendexev.c       Mon Dec 19 19:37:36 2022 +0000
@@ -146,9 +146,6 @@
     if (stuff->num_events == 0)
         return ret;
 
-    if (stuff->num_events == 0)
-        return ret;
-
     /* The client's event type must be one defined by an extension. */
 
     first = ((xEvent *) &stuff[1]);
diff -r b349dd95c9ae -r e25c7625eb98 external/mit/xorg-server/dist/hw/xfree86/int10/generic.c
--- a/external/mit/xorg-server/dist/hw/xfree86/int10/generic.c  Mon Dec 19 14:15:09 2022 +0000
+++ b/external/mit/xorg-server/dist/hw/xfree86/int10/generic.c  Mon Dec 19 19:37:36 2022 +0000
@@ -262,12 +262,6 @@
                            strerror(err));
                 goto error1;
             }
-#if 0 // XXXMRG was there in xorg-server 1.10
-           if (!int10_check_bios(screen, bios_location >> 4, vbiosMem)) {
-               xf86Msg(X_INFO, "No BIOS found\n");
-               goto error1;
-           }
-#endif
         }
     }
 
diff -r b349dd95c9ae -r e25c7625eb98 external/mit/xorg-server/dist/include/dix-config.h.in
--- a/external/mit/xorg-server/dist/include/dix-config.h.in     Mon Dec 19 14:15:09 2022 +0000
+++ b/external/mit/xorg-server/dist/include/dix-config.h.in     Mon Dec 19 19:37:36 2022 +0000
@@ -149,9 +149,6 @@
 /* Define to 1 if you have the `arc4random_buf' function. */
 #undef HAVE_ARC4RANDOM_BUF
 
-/* Define to 1 if you have the `arc4random_buf' function. */
-#undef HAVE_ARC4RANDOM_BUF
-
 /* Define to use libc SHA1 functions */
 #undef HAVE_SHA1_IN_LIBC
 
diff -r b349dd95c9ae -r e25c7625eb98 external/mit/xorg-server/dist/include/os.h
--- a/external/mit/xorg-server/dist/include/os.h        Mon Dec 19 14:15:09 2022 +0000
+++ b/external/mit/xorg-server/dist/include/os.h        Mon Dec 19 19:37:36 2022 +0000
@@ -225,16 +225,6 @@
                                              int *authlen,
                                              void *client);
 
-#if 0
-/*
- * These causes all sorts of warnings->errors in the xsrc build.
- */
-#ifdef __NetBSD__
-#undef _X_DEPRECATED
-#define _X_DEPRECATED
-#endif
-#endif
-
 /*
  * This function malloc(3)s buffer, terminating the server if there is not
  * enough memory.