Ticket #29 (closed task: fixed)

Opened 6 years ago

Last modified 3 years ago

__DARWIN__ #ifdefs should be __APPLE__

Reported by: jeremyhu@… Owned by: jeremyhu@…
Priority: Nice to Have Milestone: 2.1.2
Component: X11.pkg Version: 2.1.0 (xserver-1.3.0-apple2)
Keywords: Cc:

Description (last modified by jeremyhu@…) (diff) 

(21:21:00 Mon Dec 10 2007 jeremy@yuffie Power Macintosh)
/usr/X11/include $ grep -R '__DARWIN' .
./X11/Xosdefs.h:#ifdef __DARWIN__
./xorg/cursor.h:#ifdef __DARWIN__
./xorg/dixfont.h:#ifdef __DARWIN__
./xorg/resource.h:#ifdef __DARWIN__
./xorg/window.h:#ifdef __DARWIN__
./xorg/window.h:#ifdef __DARWIN__

Change History

comment:1 Changed 6 years ago by jeremyhu@…

  • Description modified (diff)

comment:2 Changed 6 years ago by jeremyhu@…

  • Owner changed from jeremyhu@… to bbyer@…

I fixed Xosdefs.h.

Ben, where are those /xorg/* files coming from? It looks like an antiquated xorg-server/include directory.

comment:3 Changed 6 years ago by bbyer@…

  • Status changed from new to assigned

Beats me, man.

(I'll take a look tomorrow)

comment:4 Changed 6 years ago by bbyer@…

  • Owner changed from bbyer@… to jeremyhu@…
  • Status changed from assigned to new

Yup.

​http://www.opensource.apple.com/darwinsource/10.5/X11server-46/xorg-server-X11R7.2-1.2.0/include/cursor.h

comment:5 Changed 6 years ago by jeremyhu@…

  • Status changed from new to closed
  • Resolution set to fixed

weird... according to the Makefile.am in the include directory, those should only install if the XORG DDX is enabled. I'm guessing this was some kind of hackery or bug in the build system that has since been fixed, so it looks all clean now (except that user will have leftover cruft on their systems until 10.6 I suppose)...

Note: See TracTickets for help on using tickets.