Changeset 7004 for trunk/src/kernel32/profile.cpp

Timestamp:

Oct 11, 2001, 12:24:35 AM (24 years ago)

Author:

phaller

Message:

profile compatibility (conflict w/ PROFILE macro)

File:

• trunk/src/kernel32/profile.cpp (modified) (7 diffs)

trunk/src/kernel32/profile.cpp

@@ -1 @@
-/* $Id: profile.cpp,v 1.31 2001-06-10 21:59:31 sandervl Exp $ */
+/* $Id: profile.cpp,v 1.32 2001-10-10 22:24:35 phaller Exp $ */
 
 /*
@@ -36 +36 @@
 #include "initterm.h"
 
-ODINDEBUGCHANNEL(PROFILE)
+ODINDEBUGCHANNEL(KERNEL32-PROFILE)
+
 
 // -------------------------
@@ -73 +74 @@
     char            *fullname; //name with path
     time_t           mtime;
-} PROFILE;
+} PROFILEROOT;
 
 
@@ -80 +81 @@
 
 /* Cached profile files */
-static PROFILE *MRUProfile[N_CACHED_PROFILES]={NULL};
+static PROFILEROOT *MRUProfile[N_CACHED_PROFILES]={NULL};
 
 #define CurProfile (MRUProfile[0])
@@ -475 +476 @@
     int i,j;
     struct stat buf;
-    PROFILE *tempProfile;
+    PROFILEROOT *tempProfile;
 
     if (!filename || filename[0] == 0) return FALSE;
@@ -484 +485 @@
        for(i=0;i<N_CACHED_PROFILES;i++)
          {
-          MRUProfile[i]= (PROFILE*)HEAP_xalloc( SystemHeap, 0, sizeof(PROFILE) );
+          MRUProfile[i]= (PROFILEROOT*)HEAP_xalloc( SystemHeap, 0, sizeof(PROFILEROOT) );
           MRUProfile[i]->changed=FALSE;
           MRUProfile[i]->section=NULL;
@@ -1643 +1644 @@
 ODINPROCEDURE0(WriteOutProfiles)
 {
-    PROFILE *lastCurProfile;
+    PROFILEROOT *lastCurProfile;
     INT x;