fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-05-06 02:18:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removing last bits of kdrive.

Browse source 
10. Made use system supplied Expat and Freetype2 library the default on
    Linux (documented in the release notes) (Bugzilla #218,#219) (Egbert
    Eich).
9. Patched __AMD64__ flags to __amd64__ (Egbert Eich).
8. Added RELNOTES.XORG to collect bits for release notes for this release
    (Egbert Eich).
7. Removed leftovers from libxml2 (Bugzilla #220)(Egbert Eich).
This commit is contained in:
Egbert Eich 2004-03-02 14:16:10 +00:00
parent 1e46a7cef6
commit a796465315
14 changed files with 28 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fb/fb.h
View file

@ -105,7 +105,7 @@ typedef unsigned __int64 FbBits;
defined(ia64) || defined(__ia64__) || \
defined(__sparc64__) || \
defined(__s390x__) || \
defined(AMD64) || defined (__AMD64__) || \
defined(amd64) || defined (__amd64__) || \
(defined(sgi) && (_MIPS_SZLONG == 64))
typedef unsigned long FbBits;
# else

4
hw/darwin/quartz/pseudoramiX.c
View file

@ -32,7 +32,7 @@ shall not be used in advertising or otherwise to promote the sale, use or other
dealings in this Software without prior written authorization from Digital
Equipment Corporation.
******************************************************************/
/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/pseudoramiX.c,v 1.2 2002/10/16 21:13:33 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/pseudoramiX.c,v 1.3 2003/04/30 23:15:39 torrey Exp $ */
#include "pseudoramiX.h"
@ -111,7 +111,7 @@ void PseudoramiXExtensionInit(int argc, char *argv[])
if (noPseudoramiXExtension) return;
if (pseudoramiXNumScreens == 1 || aquaNumScreens == 1) {
if (pseudoramiXNumScreens == 1) {
// Only one screen - disable Xinerama extension.
noPseudoramiXExtension = TRUE;
return;

3
hw/darwin/quartz/pseudoramiX.h
View file

@ -1,10 +1,9 @@
/*
* Minimal implementation of PanoramiX/Xinerama
*/
/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/pseudoramiX.h,v 1.1 2002/03/28 02:21:18 torrey Exp $ */
/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/pseudoramiX.h,v 1.2 2003/04/30 23:15:39 torrey Exp $ */
extern int noPseudoramiXExtension;
extern int aquaNumScreens;
void PseudoramiXAddScreen(int x, int y, int w, int h);
void PseudoramiXExtensionInit(int argc, char *argv[]);

2
hw/xfree86/common/compiler.h
View file

@ -497,7 +497,7 @@ __ustw (unsigned long r5, unsigned short * r11)
# define outw(a,b) _outw(b,a)
# define outl(a,b) _outl(b,a)
# elif defined(linux) && defined(__AMD64__)
# elif defined(linux) && defined(__amd64__)
# include <inttypes.h>

22
hw/xfree86/loader/elfloader.c
View file

@ -137,7 +137,7 @@
# if !defined(linux)
# error No MAP_ANON?
# endif
# if !defined (__AMD64__) || !defined(__linux__)
# if !defined (__amd64__) || !defined(__linux__)
# define MMAP_FLAGS (MAP_PRIVATE | MAP_ANON)
# else
# define MMAP_FLAGS (MAP_PRIVATE | MAP_ANON | MAP_32BIT)
@ -155,7 +155,7 @@
#if defined (__alpha__) || \
defined (__ia64__) || \
defined (__AMD64__) || \
defined (__amd64__) || \
(defined (__sparc__) && \
(defined (__arch64__) || \
defined (__sparcv9)))
@ -247,7 +247,7 @@ typedef Elf32_Word Elf_Word;
defined(__alpha__) || \
defined(__sparc__) || \
defined(__ia64__) || \
defined(__AMD64__)
defined(__amd64__)
typedef Elf_Rela Elf_Rel_t;
#else
typedef Elf_Rel Elf_Rel_t;
@ -441,7 +441,7 @@ ElfDelayRelocation(ELFModulePtr elffile, Elf_Word secn, Elf_Rel_t *rel)
defined(__alpha__) || \
defined(__sparc__) || \
defined(__ia64__) || \
defined(__AMD64__)
defined(__amd64__)
ELFDEBUG(", r_addend 0x%lx", rel->r_addend);
# endif
ELFDEBUG("\n");
@ -476,7 +476,7 @@ ElfCOMMONSize(void)
size += common->sym->st_size;
#if defined(__alpha__) || \
defined(__ia64__) || \
defined(__AMD64__) || \
defined(__amd64__) || \
(defined(__sparc__) && \
(defined(__arch64__) || \
defined(__sparcv9)))
@ -500,7 +500,7 @@ ElfCreateCOMMON(ELFModulePtr elffile, LOOKUP *pLookup)
size += common->sym->st_size;
#if defined(__alpha__) || \
defined(__ia64__) || \
defined(__AMD64__) || \
defined(__amd64__) || \
(defined(__sparc__) && \
(defined(__arch64__) || \
defined(__sparcv9)))
@ -555,7 +555,7 @@ ElfCreateCOMMON(ELFModulePtr elffile, LOOKUP *pLookup)
offset += common->sym->st_size;
#if defined(__alpha__) || \
defined(__ia64__) || \
defined(__AMD64__) || \
defined(__amd64__) || \
(defined(__sparc__) && \
(defined(__arch64__) || \
defined(__sparcv9)))
@ -1216,7 +1216,7 @@ Elf_RelocateEntry(ELFModulePtr elffile, Elf_Word secn, Elf_Rel_t *rel,
unsigned long *dest64;
unsigned short *dest16;
#endif
#if defined(__AMD64__)
#if defined(__amd64__)
unsigned long *dest64;
int *dest32s;
#endif
@ -1234,7 +1234,7 @@ Elf_RelocateEntry(ELFModulePtr elffile, Elf_Word secn, Elf_Rel_t *rel,
defined(__alpha__) || \
defined(__sparc__) || \
defined(__ia64__) || \
defined(__AMD64__)
defined(__amd64__)
ELFDEBUG("%lx", rel->r_addend);
# endif
ELFDEBUG("\n");
@ -1293,7 +1293,7 @@ Elf_RelocateEntry(ELFModulePtr elffile, Elf_Word secn, Elf_Rel_t *rel,
break;
#endif /* i386 */
#if defined(__AMD64__)
#if defined(__amd64__)
case R_X86_64_32:
dest32 = (unsigned int *)(secp + rel->r_offset);
# ifdef ELFDEBUG
@ -1350,7 +1350,7 @@ Elf_RelocateEntry(ELFModulePtr elffile, Elf_Word secn, Elf_Rel_t *rel,
ELFDEBUG("*dest64=%8.8lx\n", *dest64);
# endif
break;
#endif /* __AMD64__ */
#endif /* __amd64__ */
#if defined(__alpha__)
case R_ALPHA_NONE:
case R_ALPHA_LITUSE:

8
hw/xfree86/loader/loader.c
View file

@ -61,7 +61,7 @@
#include <string.h>
#if defined(linux) && \
(defined(__alpha__) || defined(__powerpc__) || defined(__ia64__) \
|| defined(__AMD64__))
|| defined(__amd64__))
#include <malloc.h>
#endif
#include <stdarg.h>
@ -368,7 +368,7 @@ LoaderInit(void)
#if defined(linux) && \
(defined(__alpha__) || defined(__powerpc__) || defined(__ia64__) \
|| ( defined __AMD64__ && ! defined UseMMAP && ! defined DoMMAPedMerge))
|| ( defined __amd64__ && ! defined UseMMAP && ! defined DoMMAPedMerge))
/*
* The glibc malloc uses mmap for large allocations anyway. This breaks
* some relocation types because the offset overflow. See loader.h for more
@ -487,7 +487,7 @@ _LoaderFileToMem(int fd, unsigned long offset, int size, char *label)
if ((new_off_bias + size) > new_size)
new_size += pagesize;
ret = (unsigned long)mmap(0, new_size, MMAP_PROT, MAP_PRIVATE
# ifdef __AMD64__
# ifdef __amd64__
| MAP_32BIT
# endif
, fd, new_off);
@ -496,7 +496,7 @@ _LoaderFileToMem(int fd, unsigned long offset, int size, char *label)
return (void *)(ret + new_off_bias);
# else
ret = (unsigned long)mmap(0, size, MMAP_PROT, MAP_PRIVATE
# ifdef __AMD64__
# ifdef __amd64__
| MAP_32BIT
# endif
, fd, offset + offsetbias);

2
hw/xfree86/os-support/bus/Pci.h
View file

@ -327,7 +327,7 @@
# if !defined(__FreeBSD__)
# define ARCH_PCI_PCI_BRIDGE sparcPciPciBridge
# endif
#elif defined(__AMD64__)
#elif defined(__amd64__)
# if defined(__FreeBSD__)
# define ARCH_PCI_INIT freebsdPciInit
# else

2
hw/xfree86/os-support/shared/libc_wrapper.c
View file

@ -496,7 +496,7 @@ xf86mmap(void *start, xf86size_t length, int prot,
if (flags & XF86_MAP_FIXED) f |= MAP_FIXED;
if (flags & XF86_MAP_SHARED) f |= MAP_SHARED;
if (flags & XF86_MAP_PRIVATE) f |= MAP_PRIVATE;
#if defined(__AMD64__) && defined(linux)
#if defined(__amd64__) && defined(linux)
if (flags & XF86_MAP_32BIT) f |= MAP_32BIT;
#endif
if (prot & XF86_PROT_EXEC) p |= PROT_EXEC;

2
hw/xfree86/utils/xorgcfg/loadmod.c
View file

@ -182,7 +182,7 @@ LOOKUP xfree86LookupTab[] = {
SYMFUNC(xf86memchr)
SYMFUNC(xf86memcmp)
SYMFUNC(xf86memcpy)
#if (defined(__powerpc__) && (defined(Lynx) || defined(linux))) || defined(__sparc__) || defined(__ia64__) || defined (__AMD64__)
#if (defined(__powerpc__) && (defined(Lynx) || defined(linux))) || defined(__sparc__) || defined(__ia64__) || defined (__amd64__)
/*
* Some PPC, SPARC, and IA64 compilers generate calls to memcpy to handle
* structure copies. This causes a problem both here and in shared

2
hw/xfree86/x86emu/x86emu/types.h
View file

@ -76,7 +76,7 @@
defined(__sparc64__) || \
defined(__s390x__) || \
(defined(__hppa__) && defined(__LP64)) || \
defined(__AMD64__) || defined(AMD64) || \
defined(__amd64__) || defined(amd64) || \
(defined(__sgi) && (_MIPS_SZLONG == 64))
#define NUM32 int
#else

2
include/servermd.h
View file

@ -389,7 +389,7 @@ SOFTWARE.
#endif /* ia64 */
#if defined(__AMD64__) || defined(AMD64)
#if defined(__amd64__) || defined(amd64)
# define IMAGE_BYTE_ORDER LSBFirst
# if defined(XF86MONOVGA) || defined(XF86VGA16) || defined(XF86MONO)

2
mi/micoord.h
View file

@ -50,7 +50,7 @@
defined(__i386__) || defined(i386) || \
defined(__ia64__) || defined(ia64) || \
defined(__s390x__) || defined(__s390__) || \
defined(__AMD64__) || defined(AMD64)
defined(__amd64__) || defined(amd64)
#define GetHighWord(x) (((int) (x)) >> 16)
#else
#define GetHighWord(x) (((int) (x)) / 65536)

2
os/xalloc.c
View file

@ -184,7 +184,7 @@ extern Bool Must_have_memory;
defined(__ia64__) || defined(ia64) || \
defined(__sparc64__) || \
defined(__s390x__) || \
defined(__AMD64__) || defined(AMD64) || \
defined(__amd64__) || defined(amd64) || \
(defined(sgi) && _MIPS_SZLONG == 64))
#define MAGIC 0x1404196414071968
#define MAGIC_FREE 0x1506196615061966

2
render/picture.h
View file

@ -170,7 +170,7 @@ typedef __int64 xFixed_32_32;
defined(ia64) || defined(__ia64__) || \
defined(__sparc64__) || \
defined(__s390x__) || \
defined(AMD64) || defined (__AMD64__) || \
defined(amd64) || defined (__amd64__) || \
(defined(sgi) && (_MIPS_SZLONG == 64))
typedef long xFixed_32_32;
# else