dotgnu-pnet-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Dotgnu-pnet-commits] CVS: pnet/image meta_build.c,1.23,1.24


From: Rhys Weatherley <address@hidden>
Subject: [Dotgnu-pnet-commits] CVS: pnet/image meta_build.c,1.23,1.24
Date: Fri, 28 Feb 2003 01:22:00 -0500

Update of /cvsroot/dotgnu-pnet/pnet/image
In directory subversions:/tmp/cvs-serv5037/image

Modified Files:
        meta_build.c 
Log Message:


Load manifest resource tokens on demand; load the file table earlier.


Index: meta_build.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/image/meta_build.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** meta_build.c        28 Feb 2003 04:57:47 -0000      1.23
--- meta_build.c        28 Feb 2003 06:21:49 -0000      1.24
***************
*** 2375,2379 ****
        int needPhase2;
  
!       /* Load information about modules and assemblies */
        EXIT_IF_ERROR(LoadTokens(image, IL_META_TOKEN_MODULE,
                                                         Load_Module, 0));
--- 2375,2379 ----
        int needPhase2;
  
!       /* Load information about modules, assemblies, and files */
        EXIT_IF_ERROR(LoadTokens(image, IL_META_TOKEN_MODULE,
                                                         Load_Module, 0));
***************
*** 2392,2395 ****
--- 2392,2397 ----
        EXIT_IF_ERROR(LoadTokens(image, IL_META_TOKEN_PROCESSOR_REF,
                                                         Load_ProcessorRef, 0));
+       EXIT_IF_ERROR(LoadTokens(image, IL_META_TOKEN_FILE,
+                                                        Load_File, 0));
  
        /* Load the assemblies that this image depends upon */
***************
*** 2491,2494 ****
--- 2493,2500 ----
                EXIT_IF_ERROR(LoadTokens(image, IL_META_TOKEN_CLASS_LAYOUT,
                                                                 
Load_ClassLayout, 0));
+ 
+               /* Load manifest resource declarations */
+               EXIT_IF_ERROR(LoadTokens(image, IL_META_TOKEN_MANIFEST_RESOURCE,
+                                                                
Load_ManifestRes, 0));
        }
  
***************
*** 2497,2508 ****
                                                         Load_DeclSecurity, 0));
  
-       /* Load file declarations */
-       EXIT_IF_ERROR(LoadTokens(image, IL_META_TOKEN_FILE,
-                                                        Load_File, 0));
- 
-       /* Load manifest resource declarations */
-       EXIT_IF_ERROR(LoadTokens(image, IL_META_TOKEN_MANIFEST_RESOURCE,
-                                                        Load_ManifestRes, 0));
- 
        /* Load exported type declarations */
        EXIT_IF_ERROR(LoadTokens(image, IL_META_TOKEN_EXPORTED_TYPE,
--- 2503,2506 ----
***************
*** 2558,2562 ****
        0,
        0,
!       0,                                                      /* 28 */
        0,
        0,
--- 2556,2560 ----
        0,
        0,
!       Load_ManifestRes,                       /* 28 */
        0,
        0,





reply via email to

[Prev in Thread] Current Thread [Next in Thread]