Ignore:
Timestamp:
Dec 18, 2011, 10:28:22 PM (14 years ago)
Author:
dmik
Message:

Merge branch gcc-kmk to trunk.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore

      •  

        old new  
        1 bin
        2 Makefile.inc
         1env.cmd
         2LocalConfig.kmk
    • Property svn:mergeinfo set to
      /branches/gcc-kmkmergedeligible

  • trunk/src/kernel32/perfview.cpp

    r7413 r21916  
    2828#else
    2929
     30#include <process.h>
     31
    3032#include <ccollection.h>
    3133#include <winbase.h>
    3234
    3335// imported from the kernel loader (initterm)
    34 extern int loadNr;
    3536extern char  kernel32Path[];
    3637
    … …  
    348349  char szFilename[260];
    349350
    350   sprintf(szFilename, "perf_%d.log", loadNr);
     351  sprintf(szFilename, "perf_%d.log", getpid());
    351352  _privateLogFile = fopen(szFilename, "w");
    352353 
    353354  if(_privateLogFile == NULL)
    354355  {
    355     sprintf(szFilename, "%sperf_%d.log", kernel32Path, loadNr);
     356    sprintf(szFilename, "%sperf_%d.log", kernel32Path, getpid());
    356357    _privateLogFile = fopen(szFilename, "w");
    357358  }
Note: See TracChangeset for help on using the changeset viewer.