mars_nwe/mars-flaim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added OSTYPE strings.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@177 0109f412-320b-0410-ab79-c3e0c5ffbbe6
This commit is contained in:
ahodgkinson
2006-03-16 21:10:24 +00:00
parent 682e9da7af
commit 31ece6c6de
2 changed files with 16 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
flaim/src/flaim.h
View File

@@ -50,6 +50,7 @@
#if defined( __NETWARE__) || defined( NLM) || defined( N_PLAT_NLM)
#define FLM_NLM
#define FLM_OSTYPE_STR "NetWare"
#if defined( __WATCOMC__)
#define FLM_WATCOM_NLM
#elif defined( __MWERKS__)
@@ -57,20 +58,24 @@
#endif
#elif defined( _WIN64)
#define FLM_WIN
#define FLM_OSTYPE_STR "Windows"
#ifndef FLM_64BIT
#define FLM_64BIT
#endif
#define FLM_STRICT_ALIGNMENT
#elif defined( _WIN32)
#define FLM_WIN
#define FLM_OSTYPE_STR "Windows"
#elif defined( _AIX)
#define FLM_UNIX
#define FLM_AIX
#define FLM_OSTYPE_STR "AIX"
#define FLM_UNIX
#define FLM_BIG_ENDIAN
#define FLM_STRICT_ALIGNMENT
#elif defined( linux)
#define FLM_UNIX
#define FLM_LINUX
#define FLM_OSTYPE_STR "Linux"
#define FLM_UNIX
#if defined( __PPC__)
#define FLM_POWER_PC
#define FLM_BIG_ENDIAN
@@ -94,21 +99,24 @@
#define FLM_STRICT_ALIGNMENT
#endif
#elif defined( sun)
#define FLM_UNIX
#define FLM_SOLARIS
#define FLM_OSTYPE_STR "Solaris"
#define FLM_UNIX
#define FLM_STRICT_ALIGNMENT
#if defined( sparc) || defined( __sparc) || defined( __sparc__)
#define FLM_SPARC
#define FLM_BIG_ENDIAN
#endif
#elif defined( __hpux) || defined( hpux)
#define FLM_UNIX
#define FLM_HPUX
#define FLM_OSTYPE_STR "HPUX"
#define FLM_UNIX
#define FLM_BIG_ENDIAN
#define FLM_STRICT_ALIGNMENT
#elif defined( __APPLE__)
#define FLM_UNIX
#define FLM_OSX
#define FLM_OSTYPE_STR "OSX"
#define FLM_UNIX
#if (defined( __ppc__) || defined( __ppc64__))
#define FLM_BIG_ENDIAN
#define FLM_STRICT_ALIGNMENT
@@ -119,7 +127,8 @@
#if !defined( FLM_64BIT) && !defined( FLM_32BIT)
#if defined( FLM_UNIX)
#if defined( __x86_64__) || defined( _LP64) || defined( __LP64__) || defined( __sparcv9)
#if defined( __x86_64__) || defined( _LP64) || \
defined( __LP64__) || defined( __sparcv9)
#define FLM_64BIT
#endif
#endif

18
flaim/util/flmunittest.cpp
View File

@@ -25,22 +25,6 @@
#include "flmunittest.h"
#if defined( FLM_WIN)
#if defined( FLM_64BIT)
#define PLATPROC_STR "w64ia64"
#else
#define PLATPROC_STR "w32x86"
#endif
#elif defined( FLM_NLM)
#define PLATPROC_STR "nwx86"
#elif defined( FLM_LINUX)
#define PLATPROC_STR "lxx86"
#elif defined( FLM_OSX)
#define PLATPROC_STR "osx"
#elif defined( FLM_SOLARIS)
#define PLATPROC_STR "solaris"
#endif
extern RCODE getTest(
IFlmTest ** ppTest);
@@ -79,7 +63,7 @@ struct TEST_INFO
pszLogfile[ 0] = 0;
pszConfig[ 0] = 0;
f_strcpy( pszEnvironment, PLATPROC_STR);
f_strcpy( pszEnvironment, FLM_OSTYPE_STR);
f_strcpy( pszBuild, __DATE__);
f_strcpy( pszUser, "defaultUser");
}