Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework

This commit is contained in:
Ian Romanick 2006-06-26 14:39:44 -07:00
commit 7c4e540253
14 changed files with 114 additions and 36 deletions

View file

@ -33,10 +33,11 @@
/*
* OSNAME is a standard form of the OS name that may be used by the
* loader and by OS-specific modules.
* loader and by OS-specific modules. OSNAME here is different from what's in
* dix-config.h
*/
#ifndef OSNAME
#undef OSNAME
#if defined(__linux__)
#define OSNAME "linux"
#elif defined(__FreeBSD__)
@ -66,7 +67,6 @@
#else
#define OSNAME "unknown"
#endif
#endif
/* Return the OS name, and run-time OS version */