ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/SheepShaver/src/include/ether_defs.h
(Generate patch)

Comparing SheepShaver/src/include/ether_defs.h (file contents):
Revision 1.4 by gbeauche, 2004-05-10T15:42:35Z vs.
Revision 1.7 by gbeauche, 2005-07-02T22:54:07Z

# Line 1 | Line 1
1   /*
2   *  ether_defs.h - Definitions for DLPI Ethernet Driver
3   *
4 < *  SheepShaver (C) 1997-2004 Marc Hellwig and Christian Bauer
4 > *  SheepShaver (C) 1997-2005 Marc Hellwig and 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 22 | Line 22
22   #define ETHER_DEFS_H
23  
24  
25 < #if __BEOS__ && __POWERPC__
25 > #if __MWERKS__ && __POWERPC__
26   #define PRAGMA_ALIGN_SUPPORTED 1
27   #define PACKED__
28   #else
# Line 209 | Line 209 | typedef int32                  nw_int32;
209   typedef uint8                   nw_uint8;
210   typedef uint16                  nw_uint16;
211   typedef uint32                  nw_uint32;
212 < typedef bool                    nw_bool;
212 > typedef int                             nw_bool;
213   typedef uint8 *                 nw_uint8_p;
214   typedef void *                  nw_void_p;
215   typedef datab *                 nw_datab_p;
# Line 248 | Line 248 | class nw_scalar_member_helper {
248          uint8 _pad[sizeof(type)];
249   public:
250          operator public_type () const {
251 <                return (public_type)nw_memory_helper<sizeof(type)>::load((void *)this);
251 >                return (public_type)(uintptr)nw_memory_helper<sizeof(type)>::load((void *)this);
252          }
253          public_type operator -> () const {
254                  return this->operator public_type ();
255          }
256          nw_scalar_member_helper<type, public_type> & operator = (public_type val) {
257 <                nw_memory_helper<sizeof(type)>::store((void *)this, (type)val);
257 >                nw_memory_helper<sizeof(type)>::store((void *)this, (type)(uintptr)val);
258                  return *this;
259          }
260          nw_scalar_member_helper<type, public_type> & operator += (int val) {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines