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/winimagepeldr.cpp

    r21355 r21916  
    4040#include <stdlib.h>
    4141
    42 #include <assert.h>
     42#ifdef DEBUG
     43#include <process.h>
    4344//use a different logfile
    4445#define PRIVATE_LOGGING
     46static FILE *_privateLogFile = NULL;
     47#endif
     48
     49#include <assert.h>
    4550#include <misc.h>
    4651#include <win32api.h>
    … …  
    5661#include "oslibmisc.h"
    5762#include "initterm.h"
    58 #include <win\virtual.h>
     63#include <win/virtual.h>
    5964#include "oslibdos.h"
    6065#include "oslibmem.h"
    … …  
    7176char szErrorModule[260] = "";
    7277
    73 #ifdef DEBUG
    74 static FILE *_privateLogFile = NULL;
    75 #endif
    76 
    7778ULONG WIN32API MissingApiOrd(char *parentimage, char *dllname, int ordinal);
    7879ULONG WIN32API MissingApiName(char *parentimage, char *dllname, char *functionname);
    … …  
    8687 char logname[CCHMAXPATH];
    8788
    88     sprintf(logname, "pe_%d.log", loadNr);
     89    sprintf(logname, "pe_%d.log", getpid());
    8990        _privateLogFile = fopen(logname, "w");
    9091    if(_privateLogFile == NULL) {
    91         sprintf(logname, "%spe_%d.log", kernel32Path, loadNr);
     92        sprintf(logname, "%spe_%d.log", kernel32Path, getpid());
    9293            _privateLogFile = fopen(logname, "w");
    9394    }
    … …  
    603604        for (i = 0; i < IMAGE_NUMBEROF_DIRECTORY_ENTRIES; i++)
    604605        {
    605             char *pszName;
     606            const char *pszName;
    606607
    607608            if(oh.DataDirectory[i].VirtualAddress && oh.DataDirectory[i].Size) {
Note: See TracChangeset for help on using the changeset viewer.