Changeset 9133 for trunk/tools/common/kFileDef.cpp

Timestamp:

Aug 26, 2002, 1:24:57 AM (23 years ago)

Author:

bird

Message:

Bugfixing on initerm issues.

File:

• trunk/tools/common/kFileDef.cpp (modified) (4 diffs)

trunk/tools/common/kFileDef.cpp

@@ -1 @@
-/* $Id: kFileDef.cpp,v 1.10 2002-08-25 22:35:46 bird Exp $
+/* $Id: kFileDef.cpp,v 1.11 2002-08-25 23:24:57 bird Exp $
  *
  * kFileDef - Definition files.
@@ -203 +203 @@
                 throw (kError(kError::DEF_BAD_LIBRARY_STATEMENT));
             fInitInstance = stristr(pszType, "INITINSTANCE") != NULL;
-            fInitGlobal   = stristr(pszType, "INITGLOBAL")   != NULL || !fInitInstance;
+            fInitGlobal   = stristr(pszType, "INITGLOBAL")   != NULL;
             fTermInstance = stristr(pszType, "TERMINSTANCE") != NULL;
             fTermGlobal   = stristr(pszType, "TERMGLOBAL")   != NULL || !fTermInstance;
@@ -681 +681 @@
                             : (fVirtualDevice                    ? "VIRTDEVICE"
                                                                  : "PHYSDEVICE" )),
-                          fLibrary ? (fInitGlobal ? "INITGLOBAL" : "INITINSTANCE") : "",
-                          fLibrary ? (fTermGlobal ? "TERMGLOBAL" : "TERMINSTANCE") : "");
+                          fLibrary ? (fInitGlobal || (!fInitInstance && !fTermInstance)
+                                                                 ? "INITGLOBAL"
+                                                                 : "INITINSTANCE")
+                                                                 : "",
+                          fLibrary ? (fTermGlobal || (!fTermInstance && !fInitInstance)
+                                                                 ? "TERMGLOBAL"
+                                                                 : "TERMINSTANCE")
+                                                                 : "");
             break;
 
@@ -693 +699 @@
                             : (fVirtualDevice                    ? "VIRTDEVICE"
                                                                  : "PHYSDEVICE" )),
-                          fLibrary ? (fInitGlobal ? "INITGLOBAL" : "INITINSTANCE") : "",
-                          fLibrary ? (fTermGlobal ? "TERMGLOBAL" : "TERMINSTANCE") : "");
+                          fLibrary ? (fInitGlobal || fTermGlobal ? "INITGLOBAL" /* Not sure how correct these things are! */
+                                                                 : "")
+                                                                 : "",
+                          /*fLibrary ? (fTermGlobal || fInitGlobal ? "TERMGLOBAL"
+                                                                 : "")
+                                                                 :*/ "");
             break;