← 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/compiler.h

  • 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/compiler.h
52
52
 
53
53
#ifndef _COMPILER_H
54
54
 
55
 
# if !defined(_XF86_ANSIC_H) && defined(XFree86Module)
56
 
#  error missing #include "xf86_ansic.h" before #include "compiler.h"
57
 
# endif
58
 
 
59
55
# define _COMPILER_H
60
56
 
61
57
#if defined(__SUNPRO_C)
1083
1079
extern volatile unsigned char *ioBase;
1084
1080
 
1085
1081
#if defined(linux) && defined(__powerpc64__)
1086
 
# include <asm/memory.h>
 
1082
# include <linux/version.h>
 
1083
# if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
 
1084
#  include <asm/memory.h>
 
1085
# endif
1087
1086
#endif /* defined(linux) && defined(__powerpc64__) */
1088
1087
#ifndef eieio /* We deal with arch-specific eieio() routines above... */
1089
1088
# define eieio() __asm__ __volatile__ ("eieio" ::: "memory")