summaryrefslogtreecommitdiffstats
path: root/defines.h
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2002-07-22 23:34:25 +0000
committerBen Lindstrom <mouring@eviladmin.org>2002-07-22 23:34:25 +0000
commit232ccf775459210ee79873d4411328bff6b8d66a (patch)
tree1b216507a0fa6b76c8c0ca9be21da3385e01897d /defines.h
parent066e1ab8a36123a910e4dc7b3e2eb15890234a60 (diff)
- (bal) [configure.ac defines.h loginrec.c sshd.c sshpty.c] Partial sync
with Cray (mostly #ifdef renaming). Patch by wendyp@cray.com.
Diffstat (limited to 'defines.h')
-rw-r--r--defines.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/defines.h b/defines.h
index d8e9c757..57d41614 100644
--- a/defines.h
+++ b/defines.h
@@ -1,7 +1,7 @@
#ifndef _DEFINES_H
#define _DEFINES_H
-/* $Id: defines.h,v 1.93 2002/07/18 16:31:52 tim Exp $ */
+/* $Id: defines.h,v 1.94 2002/07/22 23:34:25 mouring Exp $ */
/* Constants */
@@ -124,7 +124,7 @@ typedef char int8_t;
# if (SIZEOF_SHORT_INT == 2)
typedef short int int16_t;
# else
-# ifdef _CRAY
+# if defined(_CRAY) && !defined(_CRAYSV2)
# if (SIZEOF_SHORT_INT == 4)
typedef short int16_t;
# else
@@ -137,7 +137,7 @@ typedef long int16_t;
# if (SIZEOF_INT == 4)
typedef int int32_t;
# else
-# ifdef _CRAY
+# if defined(_CRAY) && !defined(_CRAYSV2)
typedef long int32_t;
# else
# error "32 bit int type not found."
@@ -161,7 +161,7 @@ typedef unsigned char u_int8_t;
# if (SIZEOF_SHORT_INT == 2)
typedef unsigned short int u_int16_t;
# else
-# ifdef _CRAY
+# if defined(_CRAY) && !defined(_CRAYSV2)
# if (SIZEOF_SHORT_INT == 4)
typedef unsigned short u_int16_t;
# else
@@ -174,7 +174,7 @@ typedef unsigned long u_int16_t;
# if (SIZEOF_INT == 4)
typedef unsigned int u_int32_t;
# else
-# ifdef _CRAY
+# if defined(_CRAY) && !defined(_CRAYSV2)
typedef unsigned long u_int32_t;
# else
# error "32 bit int type not found."