← Back to branch summary

~ubuntu-branches/ubuntu/edgy/xorg-server/edgy-updates

« back to all changes in this revision

Viewing changes to hw/xfree86/common/xf86Globals.c

  • Committer: Bazaar Package Importer
  • Author(s): Rodrigo Parra Novo
  • Date: 2006-07-25 20:06:28 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20060725200628-gjmmd9gxfxdc4ejs
Tags: 1:1.1.1-0ubuntu1
* New Upstream version
* Changed Build-Depends from mesa-swrast-source to mesa-swx11-source,
  following Debian package nomenclature
* Re-did 12_security_policy_in_etc.diff for 1.1.1
* Dropped 15_security_allocate_local.diff (applied upstream)
* Dropped 16_SECURITY_setuid.diff (applied upstream)
* Dropped 000_ubuntu_fix_read_kernel_mapping.patch (applied upstream)
* Dropped 002_ubuntu_fix_for_certain_intel_chipsets.patch (applied upstream)
* Updated versioned Build-Depends on mesa-swx11-source to version
  6.5.0.cvs.20060725-0ubuntu1
* Added arrayobj.c, arrayobj.h, bitset.h & rbadaptors.h to
  GL/symlink-mesa.sh (linked from mesa-swx11-source)
* Added arrayobj.c to default build target on GL/mesa/main

Show diffs side-by-side

added added

removed removed

Lines of Context:
hw/xfree86/common/xf86Globals.c
47
47
 
48
48
/* Globals that video drivers may access */
49
49
 
50
 
int xf86ScreenIndex = -1;       /* Index of ScrnInfo in pScreen.devPrivates */
 
50
_X_EXPORT int xf86ScreenIndex = -1;     /* Index of ScrnInfo in pScreen.devPrivates */
51
51
int xf86CreateRootWindowIndex = -1;     /* Index into pScreen.devPrivates */
52
 
ScrnInfoPtr *xf86Screens = NULL;        /* List of ScrnInfos */
53
 
int xf86PixmapIndex = 0;
54
 
const unsigned char byte_reversed[256] =
 
52
_X_EXPORT ScrnInfoPtr *xf86Screens = NULL;      /* List of ScrnInfos */
 
53
_X_EXPORT int xf86PixmapIndex = 0;
 
54
_X_EXPORT const unsigned char byte_reversed[256] =
55
55
{
56
56
    0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0,
57
57
    0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0,
182
182
MessageType xf86LogFileFrom = X_DEFAULT;
183
183
Bool xf86LogFileWasOpened = FALSE;
184
184
serverLayoutRec xf86ConfigLayout = {NULL, };
185
 
confDRIRec xf86ConfigDRI = {0, };
 
185
_X_EXPORT confDRIRec xf86ConfigDRI = {0, };
186
186
XF86ConfigPtr xf86configptr = NULL;
187
187
Bool xf86Resetting = FALSE;
188
188
Bool xf86Initialising = FALSE;
216
216
Bool xf86bsEnableFlag = FALSE;
217
217
Bool xf86bsDisableFlag = FALSE;
218
218
Bool xf86silkenMouseDisableFlag = FALSE;
 
219
#ifdef HAVE_ACPI
219
220
Bool xf86acpiDisableFlag = FALSE;
 
221
#endif
220
222
char *xf86LayoutName = NULL;
221
223
char *xf86ScreenName = NULL;
222
224
char *xf86PointerName = NULL;
242
244
Bool xf86MiscModInDevAllowNonLocal = FALSE;
243
245
#endif
244
246
RootWinPropPtr *xf86RegisteredPropertiesTable = NULL;
245
 
Bool xf86inSuspend = FALSE;
 
247
_X_EXPORT Bool xf86inSuspend = FALSE;
246
248
Bool xorgHWAccess = FALSE;
247
249
PciBusId xf86IsolateDevice;
248
250