Ignore:
Timestamp:
Feb 16, 2012, 1:01:21 PM (14 years ago)
Author:
dmik
Message:

Use TARGET_OS_FAMILY_windows instead of _WINDOWS when appropriate.

This is cleaner and also makes this code used on OS/2 w/o any extra defines.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/openjdk/hotspot/src/cpu/x86/vm/jniFastGetField_x86_32.cpp

    r309 r317  
    3434#define BUFFER_SIZE 30
    3535
    36 #if defined(_WINDOWS) || defined(OS2)
     36#ifdef TARGET_OS_FAMILY_windows
    3737GetBooleanField_t JNI_FastGetField::jni_fast_GetBooleanField_fp;
    3838GetByteField_t    JNI_FastGetField::jni_fast_GetByteField_fp;
    … …  
    114114  __ jcc (Assembler::notEqual, slow);
    115115
    116 #if !defined(_WINDOWS) && !defined(__WIN32OS2__)
     116#ifndef TARGET_OS_FAMILY_windows
    117117  __ ret (0);
    118118#else
    … …  
    136136  __ flush ();
    137137
    138 #if !defined(_WINDOWS) && !defined(OS2)
     138#ifndef TARGET_OS_FAMILY_windows
    139139  return fast_entry;
    140140#else
    … …  
    231231  __ pop (rsi);
    232232
    233 #if !defined(_WINDOWS) && !defined(__WIN32OS2__)
     233#ifndef TARGET_OS_FAMILY_windows
    234234  __ ret (0);
    235235#else
    … …  
    248248  __ flush ();
    249249
    250 #if !defined(_WINDOWS) && !defined(OS2)
     250#ifndef TARGET_OS_FAMILY_windows
    251251  return fast_entry;
    252252#else
    … …  
    325325  __ jcc (Assembler::notEqual, slow_with_pop);
    326326
    327 #if !defined(_WINDOWS) && !defined(__WIN32OS2__)
     327#ifndef TARGET_OS_FAMILY_windows
    328328  __ ret (0);
    329329#else
    … …  
    349349  __ flush ();
    350350
    351 #if !defined(_WINDOWS) && !defined(OS2)
     351#ifndef TARGET_OS_FAMILY_windows
    352352  return fast_entry;
    353353#else
Note: See TracChangeset for help on using the changeset viewer.