@@ -21,53 +21,53 @@
 #import "OFData.h"
 #import "OFString.h"
 
 #import "OFInvalidArgumentException.h"
 
-extern intmax_t of_asn1_der_integer_parse(const unsigned char *buffer,
+extern long long of_asn1_der_integer_parse(const unsigned char *buffer,
     size_t length);
 
 @implementation OFASN1Enumerated
-@synthesize integerValue = _integerValue;
+@synthesize longLongValue = _longLongValue;
 
-+ (instancetype)enumeratedWithIntegerValue: (intmax_t)integerValue
++ (instancetype)enumeratedWithLongLong: (long long)value
 {
-	return [[[self alloc] initWithIntegerValue: integerValue] autorelease];
+	return [[[self alloc] initWithLongLong: value] autorelease];
 }
 
-- (instancetype)initWithIntegerValue: (intmax_t)integerValue
+- (instancetype)initWithLongLong: (long long)value
 {
 	self = [super init];
 
-	_integerValue = integerValue;
+	_longLongValue = value;
 
 	return self;
 }
 
 - (instancetype)initWithTagClass: (of_asn1_tag_class_t)tagClass
 		       tagNumber: (of_asn1_tag_number_t)tagNumber
 		     constructed: (bool)constructed
 	      DEREncodedContents: (OFData *)DEREncodedContents
 {
-	intmax_t integerValue;
+	long long value;
 
 	@try {
 		if (tagClass != OF_ASN1_TAG_CLASS_UNIVERSAL ||
 		    tagNumber != OF_ASN1_TAG_NUMBER_ENUMERATED || constructed)
 			@throw [OFInvalidArgumentException exception];
 
 		if (DEREncodedContents.itemSize != 1)
 			@throw [OFInvalidArgumentException exception];
 
-		integerValue = of_asn1_der_integer_parse(
+		value = of_asn1_der_integer_parse(
 		    DEREncodedContents.items, DEREncodedContents.count);
 	} @catch (id e) {
 		[self release];
 		@throw e;
 	}
 
-	return [self initWithIntegerValue: integerValue];
+	return [self initWithLongLong: value];
 }
 
 - (instancetype)init
 {
 	OF_INVALID_INIT_METHOD
@@ -83,22 +83,22 @@
 	if (![object isKindOfClass: [OFASN1Enumerated class]])
 		return false;
 
 	enumerated = object;
 
-	if (enumerated->_integerValue != _integerValue)
+	if (enumerated->_longLongValue != _longLongValue)
 		return false;
 
 	return true;
 }
 
 - (uint32_t)hash
 {
-	return (uint32_t)_integerValue;
+	return (uint32_t)_longLongValue;
 }
 
 - (OFString *)description
 {
-	return [OFString stringWithFormat: @"<OFASN1Enumerated: %jd>",
-					   _integerValue];
+	return [OFString stringWithFormat: @"<OFASN1Enumerated: %lld>",
+					   _longLongValue];
 }
 @end