aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenneth Russel <[email protected]>2006-01-02 22:41:10 +0000
committerKenneth Russel <[email protected]>2006-01-02 22:41:10 +0000
commit6b4308e8b3dc41d588ff9e7519da813705a3cd94 (patch)
treec4e7f86d758ae61779f8911c506a7b3b7dc5b4a3
parent93af6f22ccdf050cafe80ab4c2d29f9924064f1c (diff)
Fixed build problem with recent 64-bit changes. Now force enum types
to be int instead of long. Neither is really correct but int is probably more correct and its behavior is easier to explain than long. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@508 232f8b59-042b-4e1e-8c03-345bb8c30851
-rw-r--r--src/classes/com/sun/gluegen/cgram/HeaderParser.g7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/classes/com/sun/gluegen/cgram/HeaderParser.g b/src/classes/com/sun/gluegen/cgram/HeaderParser.g
index 78ba5c54a..a9da6635c 100644
--- a/src/classes/com/sun/gluegen/cgram/HeaderParser.g
+++ b/src/classes/com/sun/gluegen/cgram/HeaderParser.g
@@ -289,7 +289,12 @@ options {
}
if (enumType == null) {
- enumType = new EnumType(enumTypeName, SizeThunk.LONG);
+ // This isn't quite correct. In theory the enum should expand to
+ // the size of the largest element, so if there were a long long
+ // entry the enum should expand to e.g. int64. However, using
+ // "long" here (which is what used to be the case) was
+ // definitely incorrect and caused problems.
+ enumType = new EnumType(enumTypeName, SizeThunk.INT);
}
return enumType;