simple ms os detection

This commit is contained in:
koolsmoky
2007-05-13 09:16:10 +00:00
parent e2a6f44d01
commit 4d5cadd8c8
2 changed files with 3 additions and 7 deletions

View File

@@ -418,10 +418,8 @@ GR_EXT_ENTRY(grSurfaceReleaseContext, void , (GrContext_t ctx) )
* context by yanking out the hardware mapping! %%KCD
*/
#if (GLIDE_OS & GLIDE_OS_WIN32)
if ((_GlideRoot.OS == OS_WIN32_95) ||
(_GlideRoot.OS == OS_WIN32_98) ||
(_GlideRoot.OS == OS_WIN32_ME))
hwcUnmapMemory9x ( gc->bInfo );
if ( hwcIsOSWin9x() )
hwcUnmapMemory9x ( gc->bInfo );
#endif
/* Free any windowed fifo associated w/ the context */

View File

@@ -65,9 +65,7 @@ initThreadStorage( void )
(_GlideRoot.tlsIndex > 63)) /* TLS_MINIMUM_AVAILABLE = 64 */
GrErrorCallback( "initThreadStorage: TLS index higher than 64.", FXTRUE );
#if !USE_STANDARD_TLS_FUNC
if ((_GlideRoot.OS == OS_WIN32_95) ||
(_GlideRoot.OS == OS_WIN32_98) ||
(_GlideRoot.OS == OS_WIN32_ME)) {
if ( hwcIsOSWin9x() ) {
_GlideRoot.tlsOffset = W95_TLS_INDEX_TO_OFFSET(_GlideRoot.tlsIndex);
} else {
_GlideRoot.tlsOffset = WNT_TLS_INDEX_TO_OFFSET(_GlideRoot.tlsIndex);