Index: src/CodeGen/CodeGenerator.cc
===================================================================
--- src/CodeGen/CodeGenerator.cc	(revision 25b0fde212ca4f2989674f4c453738a67d543323)
+++ src/CodeGen/CodeGenerator.cc	(revision 8fcf92109054723aa88873d699cd049c74f3cb44)
@@ -283,6 +283,5 @@
 				assert( obj );
 				output << "static ";
-				output << genType(enumDecl->base, "", options) << " const ";
-				output << mangleName( obj ) << " ";
+				output << genType(enumDecl->base, mangleName( obj ), options);
 				output << " = ";
 				output << "(" << genType(enumDecl->base, "", options) << ")";
Index: src/CodeGen/GenType.cc
===================================================================
--- src/CodeGen/GenType.cc	(revision 25b0fde212ca4f2989674f4c453738a67d543323)
+++ src/CodeGen/GenType.cc	(revision 8fcf92109054723aa88873d699cd049c74f3cb44)
@@ -255,5 +255,5 @@
 	void GenType::postvisit( EnumInstType * enumInst ) {
 		if ( enumInst->baseEnum && enumInst->baseEnum->base ) {
-			typeString = genType(enumInst->baseEnum->base, "", options) + typeString;
+			typeString = genType(enumInst->baseEnum->base, typeString, options);
 		} else {
 			typeString = enumInst->name + " " + typeString;