ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/BasiliskII/src/Unix/sysdeps.h
(Generate patch)

Comparing BasiliskII/src/Unix/sysdeps.h (file contents):
Revision 1.27 by nigel, 2003-11-18T11:14:43Z vs.
Revision 1.30 by gbeauche, 2004-06-23T14:30:48Z

# Line 1 | Line 1
1   /*
2   *  sysdeps.h - System dependent definitions for Unix
3   *
4 < *  Basilisk II (C) 1997-2002 Christian Bauer
4 > *  Basilisk II (C) 1997-2004 Christian Bauer
5   *
6   *  This program is free software; you can redistribute it and/or modify
7   *  it under the terms of the GNU General Public License as published by
# Line 98 | Line 98
98  
99   #endif
100  
101 < /* Direct Addressing requires Video on SEGV signals */
102 < #if DIRECT_ADDRESSING && !ENABLE_VOSF
101 > /* Direct Addressing requires Video on SEGV signals in plain X11 mode */
102 > #if DIRECT_ADDRESSING && (!ENABLE_VOSF && !USE_SDL_VIDEO)
103   # undef  ENABLE_VOSF
104   # define ENABLE_VOSF 1
105   #endif
# Line 156 | Line 156 | typedef int64 intptr;
156   #endif
157  
158   #ifndef HAVE_LOFF_T
159 <   typedef off_t loff_t;
159 > typedef off_t loff_t;
160 > #endif
161 > #ifndef HAVE_CADDR_T
162 > typedef char * caddr_t;
163   #endif
164  
165   /* Time data type for Time Manager emulation */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines