projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
http://www.jwz.org/xscreensaver/xscreensaver-5.07.tar.gz
[xscreensaver]
/
utils
/
vroot.h
diff --git
a/utils/vroot.h
b/utils/vroot.h
index dd4a7291a910d15cc56e2f4a480d41718b50b222..65097b839e75095a5b91c90fc62dfd2af54374fd 100644
(file)
--- a/
utils/vroot.h
+++ b/
utils/vroot.h
@@
-60,6
+60,12
@@
* Jamie Zawinski <jwz@jwz.org>, 3-Sep-2003
* - if the environment variable "XSCREENSAVER_WINDOW" is set, use that
* as the root window instead of searching for __SWM_VROOT.
* Jamie Zawinski <jwz@jwz.org>, 3-Sep-2003
* - if the environment variable "XSCREENSAVER_WINDOW" is set, use that
* as the root window instead of searching for __SWM_VROOT.
+ *
+ * Jamie Zawinski <jwz@jwz.org>, 14-Aug-2004
+ * - changes to get gcc to stop whining about "type punning".
+ *
+ * Jamie Zawinski <jwz@jwz.org>, 16-Dec-2004
+ * - fixed that last fix.
*/
#ifndef _VROOT_H_
*/
#ifndef _VROOT_H_
@@
-68,7
+74,7
@@
#if !defined(lint) && !defined(SABER)
static const char vroot_rcsid[] =
#if !defined(lint) && !defined(SABER)
static const char vroot_rcsid[] =
- "#Id: vroot.h,v 1.
5 2003/09/04 01:04:38
jwz Exp #" "\n"
+ "#Id: vroot.h,v 1.
8 2004/12/16 05:33:54
jwz Exp #" "\n"
"#Id: vroot.h,v 1.4 1991/09/30 19:23:16 stolcke Exp stolcke #";
#endif
"#Id: vroot.h,v 1.4 1991/09/30 19:23:16 stolcke Exp stolcke #";
#endif
@@
-124,7
+130,7
@@
VirtualRootWindowOfScreen(screen) Screen *screen;
&nitems, &bytesafter,
&newRoot) == Success
&& newRoot) {
&nitems, &bytesafter,
&newRoot) == Success
&& newRoot) {
- root =
(Window) *newRoot
;
+ root =
*((Window *) newRoot)
;
break;
}
}
break;
}
}