~chasedouglas/ubuntu/maverick/xorg-server/multitouch

« back to all changes in this revision

Viewing changes to os/log.c

  • Committer: Bazaar Package Importer
  • Author(s): Julien Cristau, Julien Cristau, Christopher James Halse Rogers
  • Date: 2010-06-07 23:22:48 UTC
  • mfrom: (0.9.4 upstream)
  • mto: This revision was merged to the branch mainline in revision 187.
  • Revision ID: james.westby@ubuntu.com-20100607232248-x9ob0sjy8bwkc2ki
Tags: 2:1.8.1.901-1
[ Julien Cristau ]
* New upstream release
* Merge changes from 2:1.7.7-2.

[ Christopher James Halse Rogers ]
* 16-xaa-fbcomposite-fix-negative-size.diff:
  - mi hunk merged upstream.  Update to keep just the fbpict.c hunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
118
118
static Bool needBuffer = TRUE;
119
119
 
120
120
#ifdef __APPLE__
 
121
#include <AvailabilityMacros.h>
 
122
 
121
123
static char __crashreporter_info_buff__[4096] = {0};
122
124
static const char *__crashreporter_info__ = &__crashreporter_info_buff__[0];
 
125
#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
 
126
// This is actually a toolchain requirement, but I'm not sure the correct check,        
 
127
// but it should be fine to just only include it for Leopard and later.  This line
 
128
// just tells the linker to never strip this symbol (such as for space optimization)
123
129
asm (".desc ___crashreporter_info__, 0x10");
124
130
#endif
 
131
#endif
125
132
 
126
133
/* Prefix strings for log messages. */
127
134
#ifndef X_UNKNOWN_STRING