Re: wine/loader preloader.c

[Michael Stefaniuc]

Hello,

On Fri, Jun 25, 2004 at 07:12:20PM -0500, Alexandre Julliard wrote:
> ChangeSet ID: 12717
> CVSROOT:      /opt/cvs-commit
> Module name:  wine
> Changes by:   [EMAIL PROTECTED]       2004/06/25 19:12:20
> 
> Modified files:
>       loader         : preloader.c 
> 
> Log message:
>       Remove the AT_SYSINFO and AT_SYSINFO_EHDR values if the sysinfo page
>       is in one of our reserved ranges.
On Red Hat Linux 9 there is no AT_SYSINFO_EHDR in /usr/include/elf.h
thus breaking compilation there. I've attached a trivial patch to fix
this.

> 
> Patch: http://cvs.winehq.org/patch.py?id=12717
> 
> Old revision  New revision  Changes     Path
>  1.6           1.7           +62 -20     wine/loader/preloader.c

bye
        michael

-- 
Michael Stefaniuc               Tel.: +49-711-96437-199
System Administration           Fax.: +49-711-96437-111
Red Hat GmbH                    Email: [EMAIL PROTECTED]
Hauptstaetterstr. 58            http://www.redhat.de/
D-70178 Stuttgart

Index: loader/preloader.c
===================================================================
RCS file: /home/wine/wine/loader/preloader.c,v
retrieving revision 1.7
diff -u -r1.7 preloader.c
--- loader/preloader.c  26 Jun 2004 00:12:20 -0000      1.7
+++ loader/preloader.c  26 Jun 2004 11:49:14 -0000
@@ -367,7 +367,9 @@
         NAME(AT_PHNUM),
         NAME(AT_PLATFORM),
         NAME(AT_SYSINFO),
+#ifdef AT_SYSINFO_EHDR
         NAME(AT_SYSINFO_EHDR),
+#endif
         NAME(AT_UID),
         { 0, NULL }
     };
@@ -920,7 +922,9 @@
     i = 0;
     /* delete sysinfo values if addresses conflict */
     if (is_in_preload_range( av, AT_SYSINFO )) delete_av[i++].a_type = AT_SYSINFO;
+#ifdef AT_SYSINFO_EHDR
     if (is_in_preload_range( av, AT_SYSINFO_EHDR )) delete_av[i++].a_type = 
AT_SYSINFO_EHDR;
+#endif
     delete_av[i].a_type = AT_NULL;
 
     /* get rid of first argument */

pgp2ivsGUaIX2.pgp
Description: PGP signature