Request removal of patch #1622 from 6.8.2

Alan Coopersmith Alan.Coopersmith at Sun.COM
Sun Jan 30 13:05:07 PST 2005


This patch is causing compiles of 6.8.2 rc 3 to fail with the Sun Studio 10
compilers on Solaris:

2005-01-12 Roland Mainz <roland.mainz at nrubsig.org>
   * xc/programs/Xserver/hw/xfree86/xf86config/xorgconfig.c
   Bugzilla #2206 (https://bugs.freedesktop.org/show_bug.cgi?id=2206)
   attachment #1622 (https://bugs.freedesktop.org/attachment.cgi?id=1622):
   Fix missing return value in xf86config.
   Patch by Egbert Eich <eich at freedesktop.org>.

The error given is:
"xorgconfig.c", line 1741: void function cannot return value

The patch was correct for CVS head, where a previous post-6.8.0 change
modified the function in question to return a value, but since that change
was not pulled into the 6.8.2 branch, the function is still void, so the
patch is unnecessary and breaks when using strict C compilers.

Alternatively, the previous changes from head could be pulled into 6.8.2.
I never got around to putting them into bugzilla, but you can see them at:
http://cvs.freedesktop.org/xorg/xc/programs/Xserver/hw/xfree86/xf86config/xorgconfig.c?r1=1.6&r2=1.7

They fixed:
	* xc/programs/Xserver/hw/xfree86/xf86config/xorgconfig.c:
	Make xorgconfig ask again instead of giving up and throwing
	away all your answers when you give a bad file name or bad
	amount of video RAM.  (Sun bug id 5070654 - Derek Wang)

(This is the only error found building on Solaris so far - backing out this
  one line fix allows this file to compile - I'm restarting the make World
  now to verify this allows a clean build.)

-- 
	-Alan Coopersmith-           alan.coopersmith at sun.com
	 Sun Microsystems, Inc. - X Window System Engineering



More information about the release-wranglers mailing list