From 55dc5e1576b23f3b238c3b7522bd1b49f60f1c52 Mon Sep 17 00:00:00 2001
From: XScreenSaver owners <xscreensaver-owner@fedoraproject.org>
Date: Sun, 8 Nov 2020 00:20:34 +0900
Subject: [PATCH] Remove unneeded undefining to make LTO happy
Currently on windows.c and subprocs.c, some Xt related typedef definition is undefined and
instead some stub defintion is used, which makes LTO complain about saver_info struct definition
being different and warn about aliasing.
Remove these undefining and use original Xt definition to make saver_info struct definition
consistent
---
driver/subprocs.c | 9 +--------
driver/windows.c | 9 +--------
2 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/driver/subprocs.c b/driver/subprocs.c
index e251842..28bffbf 100644
--- a/driver/subprocs.c
+++ b/driver/subprocs.c
@@ -18,6 +18,7 @@
#include <stdio.h>
#include <string.h>
+#include <X11/Intrinsic.h>
#include <X11/Xlib.h> /* not used for much... */
#ifndef ESRCH
@@ -58,14 +59,6 @@ extern int putenv (/* const char * */); /* getenv() is in stdlib.h... */
extern int kill (pid_t, int); /* signal() is in sys/signal.h... */
-/* This file doesn't need the Xt headers, so stub these types out... */
-#undef XtPointer
-#define XtAppContext void*
-#define XrmDatabase void*
-#define XtIntervalId void*
-#define XtPointer void*
-#define Widget void*
-
#include "xscreensaver.h"
#include "exec.h"
#include "yarandom.h"
diff --git a/driver/windows.c b/driver/windows.c
index 9e47c45..b1798a6 100644
--- a/driver/windows.c
+++ b/driver/windows.c
@@ -31,6 +31,7 @@
#include <stdio.h>
/* #include <X11/Xproto.h> / * for CARD32 */
+#include <X11/Intrinsic.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h> /* for XSetClassHint() */
#include <X11/Xatom.h>
@@ -58,14 +59,6 @@ typedef long PROP32;
# include <X11/extensions/Xinerama.h>
#endif /* HAVE_XINERAMA */
-/* This file doesn't need the Xt headers, so stub these types out... */
-#undef XtPointer
-#define XtAppContext void*
-#define XrmDatabase void*
-#define XtIntervalId void*
-#define XtPointer void*
-#define Widget void*
-
#include "xscreensaver.h"
#include "visual.h"
#include "fade.h"
--
2.28.0