diff options
author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-03-07 09:03:46 -0500 |
---|---|---|
committer | Eamon Walsh <ewalsh@moss-uranus.epoch.ncsc.mil> | 2007-03-07 09:03:46 -0500 |
commit | bb111291d854b4329e47367ce3c67e8a2785e6e9 (patch) | |
tree | 24d65b1e029549c13d151d4d6c862bb229b0500f /hw/xfree86/loader/dixsym.c | |
parent | 74175e0af74c530cb712a6772d3c5d61d1be9748 (diff) | |
parent | e9bfb2b3d7dfaafd90d2ad0fa3d0e1acced4380b (diff) |
Merge branch 'master' into XACE-SELINUX
Diffstat (limited to 'hw/xfree86/loader/dixsym.c')
-rw-r--r-- | hw/xfree86/loader/dixsym.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/hw/xfree86/loader/dixsym.c b/hw/xfree86/loader/dixsym.c index 5479ed0df..6b52aea98 100644 --- a/hw/xfree86/loader/dixsym.c +++ b/hw/xfree86/loader/dixsym.c @@ -280,10 +280,8 @@ _X_HIDDEN void *dixLookupTab[] = { SYMFUNC(AllocateColormapPrivateIndex) SYMFUNC(AllocateDevicePrivateIndex) SYMFUNC(AllocateDevicePrivate) -#ifdef PIXPRIV SYMFUNC(AllocatePixmapPrivateIndex) SYMFUNC(AllocatePixmapPrivate) -#endif /* resource.c */ SYMFUNC(AddResource) SYMFUNC(ChangeResourceValue) |