9838b7032e
This is strictly the application of the script 'x-indent-all.sh' from util/modular. Compared to the patch that Daniel posted in January, I've added a few indent flags: -bap -psl -T PrivatePtr -T pmWait -T _XFUNCPROTOBEGIN -T _XFUNCPROTOEND -T _X_EXPORT The typedefs were needed to make the output of sdksyms.sh match the previous output, otherwise, the code is formatted badly enough that sdksyms.sh generates incorrect output. The generated code was compared with the previous version and found to be essentially identical -- "assert" line numbers and BUILD_TIME were the only differences found. The comparison was done with this script: dir1=$1 dir2=$2 for dir in $dir1 $dir2; do (cd $dir && find . -name '*.o' | while read file; do dir=`dirname $file` base=`basename $file .o` dump=$dir/$base.dump objdump -d $file > $dump done) done find $dir1 -name '*.dump' | while read dump; do otherdump=`echo $dump | sed "s;$dir1;$dir2;"` diff -u $dump $otherdump done Signed-off-by: Keith Packard <keithp@keithp.com> Acked-by: Daniel Stone <daniel@fooishbar.org> Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>
33 lines
961 B
C
33 lines
961 B
C
/*
|
|
* Don't #include any of the AppKit, etc stuff directly since it will
|
|
* pollute the X11 namespace.
|
|
*/
|
|
|
|
#ifndef _XQ_SANITIZED_CARBON_H_
|
|
#define _XQ_SANITIZED_CARBON_H_
|
|
|
|
// QuickDraw in ApplicationServices has the following conflicts with
|
|
// the basic X server headers. Use QD_<name> to use the QuickDraw
|
|
// definition of any of these symbols, or the normal name for the
|
|
// X11 definition.
|
|
#define Cursor QD_Cursor
|
|
#define WindowPtr QD_WindowPtr
|
|
#define Picture QD_Picture
|
|
#define BOOL OSX_BOOL
|
|
#define EventType HIT_EventType
|
|
|
|
#include <ApplicationServices/ApplicationServices.h>
|
|
#include <CoreServices/CoreServices.h>
|
|
#include <Carbon/Carbon.h>
|
|
#include <IOKit/hidsystem/event_status_driver.h>
|
|
#include <IOKit/hidsystem/ev_keymap.h>
|
|
#include <architecture/byte_order.h> // For the NXSwap*
|
|
|
|
#undef Cursor
|
|
#undef WindowPtr
|
|
#undef Picture
|
|
#undef BOOL
|
|
#undef EventType
|
|
|
|
#endif /* _XQ_SANITIZED_CARBON_H_ */
|