diff options
| author | Ben Byer <bbyer@freedesktop.org> | 2009-09-27 10:35:53 -0700 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2009-09-27 23:32:19 -0700 |
| commit | efacd7bfd08ffc0725de6f639c6afbf3b2f6c9fe (patch) | |
| tree | 9a8fa5483566a049932046decb2778386a445781 /dix | |
| parent | b3415187e92960cbff784108b5a3a8d130dc34c5 (diff) | |
Add (ok, fix) support for DTrace under OS X
(cherry picked from commit 8428a57184f542941d2c8c90e97d18e111a69dd2)
Diffstat (limited to 'dix')
| -rw-r--r-- | dix/Makefile.am | 2 | ||||
| -rw-r--r-- | dix/Xserver.d | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/dix/Makefile.am b/dix/Makefile.am index 764860ce3..85a8767d2 100644 --- a/dix/Makefile.am +++ b/dix/Makefile.am @@ -54,6 +54,7 @@ Xserver-dtrace.h: $(srcdir)/Xserver.d $(DTRACE) -C -h -o $@ -s $(srcdir)/Xserver.d \ || cp Xserver-dtrace.h.in $@ +if !XQUARTZ # Generate dtrace object code for probes in libdix dtrace-dix.o: $(top_srcdir)/dix/Xserver.d $(am_libdix_la_OBJECTS) $(DTRACE) -G -C -o $@ -s $(top_srcdir)/dix/Xserver.d $(am_libdix_la_OBJECTS:%.lo=.libs/%.o) @@ -63,6 +64,7 @@ noinst_PROGRAMS = dix.O dix.O: dtrace-dix.o $(am_libdix_la_OBJECTS) ld -r -o $@ $(am_libdix_la_OBJECTS:%.lo=.libs/%.o) endif +endif dix.c: touch $@ diff --git a/dix/Xserver.d b/dix/Xserver.d index e4c9b8320..cea97e908 100644 --- a/dix/Xserver.d +++ b/dix/Xserver.d @@ -29,8 +29,13 @@ /* * Xserver dtrace provider definition */ - +#ifdef __APPLE__ +#define string char * +#define pid_t uint32_t +#define zoneid_t uint32_t +#else #include <sys/types.h> +#endif provider Xserver { /* reqType, data, length, client id, request buffer */ |