natClassLoader.cc (_Jv_NewClass): Use JV_STATE_NOTHING, not `0'.

	* java/lang/natClassLoader.cc (_Jv_NewClass): Use
	JV_STATE_NOTHING, not `0'.
	* java/lang/Class.h: Replaced JV_STATE_ defines with enum.

From-SVN: r29033

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index c2f8b0ae63fabf74eb963ee27905766912eee847..721eee10e50e048d90cd42ecbec6ff451698243e 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,9 @@
 1999-09-01  Tom Tromey  <tromey@cygnus.com>
 
+       * java/lang/natClassLoader.cc (_Jv_NewClass): Use
+       JV_STATE_NOTHING, not `0'.
+       * java/lang/Class.h: Replaced JV_STATE_ defines with enum.
+
        * posix-threads.cc (_Jv_CondWait): Use _Jv_PthreadGetMutex.
        * include/posix-threads.h (_Jv_Mutex_t): Define as structure,
        except on Linux.

diff --git a/libjava/java/lang/Class.h b/libjava/java/lang/Class.h
index fd2c2eba777d4a97287daaeac151079296977676..b3a86664e69685c75d79f04c9a6965418a9aacc7 100644 (file)
--- a/libjava/java/lang/Class.h
+++ b/libjava/java/lang/Class.h
@@ -23,25 +23,26 @@ extern "C" void _Jv_InitClass (jclass klass);
 extern "C" void _Jv_RegisterClasses (jclass *classes);
 
 // These are the possible values for the `state' field of the class
-// structure.  Note that ordering is important here; in particular
-// `resolved' must come between `nothing' and the other states.
-// Whenever the state changes, one should notify all waiters of this
-// class.
-#define JV_STATE_NOTHING       0 // set by compiler
-
-#define JV_STATE_PRELOADING    1 // can do _Jv_FindClass
-#define JV_STATE_LOADING       3 // has super installed
-#define JV_STATE_LOADED        5 // is complete
+// structure.  Note that ordering is important here.  Whenever the
+// state changes, one should notify all waiters of this class.
+enum
+{
+  JV_STATE_NOTHING = 0,                // Set by compiler.
+
+  JV_STATE_PRELOADING = 1,     // Can do _Jv_FindClass.
+  JV_STATE_LOADING = 3,                // Has super installed.
+  JV_STATE_LOADED = 5,         // Is complete.
     
-#define JV_STATE_COMPILED      6 // this was a compiled class
+  JV_STATE_COMPILED = 6,       // This was a compiled class.
 
-#define JV_STATE_PREPARED      7 // layout & static init done
-#define JV_STATE_LINKED        9 // strings interned
+  JV_STATE_PREPARED = 7,       // Layout & static init done.
+  JV_STATE_LINKED = 9,         // Strings interned.
 
-#define JV_STATE_IN_PROGRESS  10 // <clinit> running
-#define JV_STATE_DONE         12 // 
+  JV_STATE_IN_PROGRESS = 10,   // <Clinit> running.
+  JV_STATE_DONE = 12,          // 
 
-#define JV_STATE_ERROR        14 // must be last
+  JV_STATE_ERROR = 14          // must be last.
+};
 
 struct _Jv_Field;
 struct _Jv_VTable;

diff --git a/libjava/java/lang/natClassLoader.cc b/libjava/java/lang/natClassLoader.cc
index 0bd7cd0d9e94035260f7dd4347fad374b41e772f..4c0f411a87764bb5a6e3ba48ebcf3d1c80921baf 100644 (file)
--- a/libjava/java/lang/natClassLoader.cc
+++ b/libjava/java/lang/natClassLoader.cc
@@ -547,7 +547,7 @@ _Jv_NewClass (_Jv_Utf8Const *name, jclass superclass,
   ret->interfaces = NULL;
   ret->loader = loader;
   ret->interface_count = 0;
-  ret->state = 0;
+  ret->state = JV_STATE_NOTHING;
   ret->thread = NULL;
 
   _Jv_RegisterClass (ret);