diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2006-08-21 13:07:41 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2006-08-21 13:07:41 -0700 |
| commit | 05541259bdb0dfaab015a01caa3722b7a1b782e2 (patch) | |
| tree | 601293b594050a1d30ae5fbca2ececb7fd7cc936 /include | |
| parent | c2535f67923bde0bfb0e72363467110806e2f40f (diff) | |
| parent | a1ac0440bba690368aa4226468ce571be1a09d95 (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into XACE-modular
Diffstat (limited to 'include')
| -rw-r--r-- | include/opaque.h | 1 | ||||
| -rw-r--r-- | include/xorg-config.h.in | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/opaque.h b/include/opaque.h index 4ccccd054..3d19d275f 100644 --- a/include/opaque.h +++ b/include/opaque.h @@ -73,6 +73,7 @@ extern int limitNoFile; extern Bool defeatAccessControl; extern long maxBigRequestSize; extern Bool blackRoot; +extern Bool whiteRoot; extern Bool CoreDump; diff --git a/include/xorg-config.h.in b/include/xorg-config.h.in index e43d1d13f..4a64522a7 100644 --- a/include/xorg-config.h.in +++ b/include/xorg-config.h.in @@ -109,4 +109,7 @@ /* Name of the period field in struct kbd_repeat */ #undef LNX_KBD_PERIOD_NAME +/* Have execinfo.h */ +#undef HAVE_EXECINFO_H + #endif /* _XORG_CONFIG_H_ */ |