diff options
| author | Robert Mustacchi <rm@joyent.com> | 2012-04-13 17:03:03 +0000 |
|---|---|---|
| committer | Robert Mustacchi <rm@joyent.com> | 2012-04-13 20:27:07 +0000 |
| commit | 6a257671a53019c0387e873ba3771dc522f75caa (patch) | |
| tree | 03e91f8f1f7569a55831974a8a467641b4e8e9ff /usr/src | |
| parent | 40c6f710ca04d287406de9c7e56773ae384340dc (diff) | |
| download | illumos-joyent-6a257671a53019c0387e873ba3771dc522f75caa.tar.gz | |
OS-1098 vmxnet breaks the studio shadow build
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/uts/intel/io/vmxnet/vm_basic_types.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr/src/uts/intel/io/vmxnet/vm_basic_types.h b/usr/src/uts/intel/io/vmxnet/vm_basic_types.h index 4f233f0be9..adeac1b708 100644 --- a/usr/src/uts/intel/io/vmxnet/vm_basic_types.h +++ b/usr/src/uts/intel/io/vmxnet/vm_basic_types.h @@ -170,7 +170,7 @@ typedef int8_t int8; typedef unsigned __int64 uint64; typedef signed __int64 int64; -#elif __GNUC__ +#elif defined(__GNUC__) || defined(__SUNPRO_C) /* The Xserver source compiles with -ansi -pendantic */ # if !defined(__STRICT_ANSI__) || defined(__FreeBSD__) # if defined(VM_X86_64) @@ -317,7 +317,7 @@ typedef int64 VmTimeVirtualClock; /* Virtual Clock kept in CPU cycles */ #endif #define FMTPD "l" #define FMTH "" -#elif __GNUC__ +#elif defined(__GNUC__) || defined(__SUNPRO_C) #define FMTH "" #if defined(N_PLAT_NLM) || defined(sun) || \ (defined(__FreeBSD__) && (__FreeBSD__ + 0) && ((__FreeBSD__ + 0) < 5)) @@ -385,7 +385,7 @@ typedef int64 VmTimeVirtualClock; /* Virtual Clock kept in CPU cycles */ #elif defined __APPLE__ #define CONST64(c) c##LL #define CONST64U(c) c##uLL -#elif __GNUC__ +#elif defined(__GNUC__) || defined(__SUNPRO_C) #ifdef VM_X86_64 #define CONST64(c) c##L #define CONST64U(c) c##uL |