diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2001-10-24 23:54:46 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2001-10-24 23:54:46 +0000 |
| commit | bfbe811222f3a269c22c52f97e20849a8a65a4c7 (patch) | |
| tree | ec04ad2d58dc796ed3ff5531495e6f567135f55d /c/src/lib/libcpu | |
| parent | 2001-10-23 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-bfbe811222f3a269c22c52f97e20849a8a65a4c7.tar.bz2 | |
2001-10-24 Joel Sherrill <joel@OARcorp.com>
* mpc8260/include/mpc8260.h: "or" is a keyword in C++.
Diffstat (limited to 'c/src/lib/libcpu')
| -rw-r--r-- | c/src/lib/libcpu/powerpc/ChangeLog | 4 | ||||
| -rw-r--r-- | c/src/lib/libcpu/powerpc/mpc8260/include/mpc8260.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/c/src/lib/libcpu/powerpc/ChangeLog b/c/src/lib/libcpu/powerpc/ChangeLog index 5873ecf6d5..493f6d6856 100644 --- a/c/src/lib/libcpu/powerpc/ChangeLog +++ b/c/src/lib/libcpu/powerpc/ChangeLog @@ -1,3 +1,7 @@ +2001-10-24 Joel Sherrill <joel@OARcorp.com> + + * mpc8260/include/mpc8260.h: "or" is a keyword in C++. + 2001-10-22 Andy Dachs <a.dachs@sstl.co.uk> * Makefile.am, README, configure.ac, new_exception_processing/cpu.h, diff --git a/c/src/lib/libcpu/powerpc/mpc8260/include/mpc8260.h b/c/src/lib/libcpu/powerpc/mpc8260/include/mpc8260.h index d6126afbf2..a7c2216a18 100644 --- a/c/src/lib/libcpu/powerpc/mpc8260/include/mpc8260.h +++ b/c/src/lib/libcpu/powerpc/mpc8260/include/mpc8260.h @@ -67,7 +67,7 @@ */ typedef struct m8260MEMCRegisters_ { rtems_unsigned32 br; - rtems_unsigned32 or; + rtems_unsigned32 _or; /* or is a C++ keyword :( */ } m8260MEMCRegisters_t; |