Bug 2207

Summary: gcc 4 complains about #ifdef (linux)
Product: xorg Reporter: Egbert Eich <eich>
Component: * OtherAssignee: Xorg Project Team <xorg-team>
Status: RESOLVED FIXED QA Contact:
Severity: normal    
Priority: high CC: roland.mainz, sndirsch
Version: git   
Hardware: x86 (IA32)   
OS: Linux (All)   
Whiteboard:
i915 platform: i915 features:
Attachments:
Description Flags
[FIXED_X11R68x] Fix roland.mainz: 6.8-branch+

Description Egbert Eich 2005-01-03 09:59:43 UTC
Gcc 4 appearantly doesn't like the predefines linux (without underscores) any
more. They need to be replaced by __linux__.
Comment 1 Egbert Eich 2005-01-03 10:03:02 UTC
Created attachment 1623 [details] [review]
[FIXED_X11R68x] Fix

Fix ifdefs in two header files to muffle compiler.
Comment 2 Egbert Eich 2005-01-03 10:04:22 UTC
Fixed in head.
Comment 3 Roland Mainz 2005-01-11 18:49:22 UTC
Comment on attachment 1623 [details] [review]
[FIXED_X11R68x] Fix

Approved for checkin into X11R6.8.x stable branch. Please don't commit
yourself, I'll do that myself in a few mins...
Comment 4 Roland Mainz 2005-01-11 18:57:03 UTC
Comment on attachment 1623 [details] [review]
[FIXED_X11R68x] Fix

Patch checked-in into X11R6.8.x stable branch.

/cvs/xorg/xc/ChangeLog,v  <--  ChangeLog
new revision: 1.365.2.109; previous revision: 1.365.2.108
cvs commit: Using deprecated info format strings.  Convert your scripts to use
the new argument format and remove '1's from your info file format strings.
/cvs/xorg/xc/include/Xos.h,v  <--  Xos.h
new revision: 1.2.4.1; previous revision: 1.2
/cvs/xorg/xc/include/Xthreads.h,v  <--	Xthreads.h
new revision: 1.2.4.1; previous revision: 1.2
cvs commit: Using deprecated info format strings.  Convert your scripts to use
the new argument format and remove '1's from your info file format strings.
Mailing the commit message to xorg-commit@lists.freedesktop.org...
Comment 5 Roland Mainz 2005-01-11 18:58:10 UTC
Patch checked-in into Xorg trunk and X11R6.8.x stable branch...

... marking bug as FIXED.

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.