diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2007-10-02 19:07:04 +0000 |
|---|---|---|
| committer | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2011-02-27 21:09:15 +0200 |
| commit | 97546c36fdd39f75b229dfe85db89ac70eeb6bab (patch) | |
| tree | 2de107b6c1925f4013f5f6e8530d8409ebac9a60 /software/include/octosdependant.h | |
| parent | aacbf702d93814477914e6dcab846e27a9733b43 (diff) | |
merge up to PR49
git-svn-id: http://svn.asterisk.org/svn/octasic_api/oct612x/trunk@33 537310ab-6354-42db-a3cc-247b777f7be6
Diffstat (limited to 'software/include/octosdependant.h')
| -rw-r--r-- | software/include/octosdependant.h | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/software/include/octosdependant.h b/software/include/octosdependant.h index 9a94fb2..6e797bc 100644 --- a/software/include/octosdependant.h +++ b/software/include/octosdependant.h @@ -4,7 +4,7 @@ File: octosdependant.h Copyright (c) 2001-2007 Octasic Inc. -Description: +Description: This file is included to set target-specific constants. @@ -22,9 +22,9 @@ You should have received a copy of the GNU General Public License along with the OCT6100 GPL API; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Release: OCT612xAPI-01.00-PR48 $ +$Octasic_Release: OCT612xAPI-01.00-PR49 $ -$Octasic_Revision: 17 $ +$Octasic_Revision: 18 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -63,8 +63,8 @@ extern "C" { GCC Compiler __GNUC__ == GCC Compiler - __unix__ == Unix system - __vax__ == Unix system + __unix__ == Unix system + __vax__ == Unix system unix == Unix system vax == vax system @@ -98,7 +98,7 @@ extern "C" { /* Try with cpu type */ #if !defined(OCT_MACH_ENDIAN) /* Look for intel */ - #if defined( _M_IX86 ) + #if defined( _M_IX86 ) #define OCT_MACH_ENDIAN OCT_MACH_LITTLE_ENDIAN /* Look for PowerPC */ #elif defined( _M_MPPC ) || defined( _M_PPC ) || defined(PPC) || defined(__PPC) || defined(_ARCH_PPC) @@ -107,17 +107,17 @@ extern "C" { #if CPU==PPC860 || CPU==SIMNT #define OCT_MACH_ENDIAN OCT_MACH_BIG_ENDIAN #else - #define OCT_MACH_ENDIAN OCT_MACH_LITTLE_ENDIAN + #define OCT_MACH_ENDIAN OCT_MACH_LITTLE_ENDIAN #endif #else - #define OCT_MACH_ENDIAN OCT_MACH_LITTLE_ENDIAN + #define OCT_MACH_ENDIAN OCT_MACH_LITTLE_ENDIAN #endif #endif #else #if defined( MACH_TYPE_BIG_ENDIAN ) #define OCT_MACH_ENDIAN OCT_MACH_BIG_ENDIAN #else - #define OCT_MACH_ENDIAN OCT_MACH_LITTLE_ENDIAN + #define OCT_MACH_ENDIAN OCT_MACH_LITTLE_ENDIAN #endif #endif @@ -134,7 +134,9 @@ extern "C" { #elif defined( _VXWORKS_ ) #define OCT_VXENV #elif defined( _ECOS_ ) +#ifndef OCT_ECOSENV #define OCT_ECOSENV +#endif /* OCT_ECOSENV */ #elif defined( _SOLARIS_ ) #define OCT_SOLARISENV #elif defined( _LINUX_ ) |