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

    r21308 r21916  
    2727#include <string.h>
    2828#include <stdlib.h>
     29#ifndef __GNUC__
    2930#include <iostream.h>
    3031#include <fstream.h>
     32#endif
    3133#include <misc.h>
    3234#include <win32api.h>
    3335#include <pefile.h>
    34 #include <windllbase.h>
    35 #include <winimagepe2lx.h>
    36 #include <windllpe2lx.h>
    37 #include <winimagelx.h>
    38 #include <windlllx.h>
     36#include "windllbase.h"
     37#include "winimagepe2lx.h"
     38#include "windllpe2lx.h"
     39#include "winimagelx.h"
     40#include "windlllx.h"
    3941#include <wprocess.h>
    4042#include "exceptions.h"
    … …  
    726728 char renameddll[CCHMAXPATH];
    727729 char *namestart;
    728  char *sectionname;
     730 const char *sectionname;
    729731
    730732    if(fWinToOS2) {
    … …  
    791793    dll = head;
    792794    while(dll) {
    793         if(strcmpi(szDllName, dll->szModule) == 0) {
     795        if(stricmp(szDllName, dll->szModule) == 0) {
    794796            dlllistmutex.leave();
    795797            return(dll);
Note: See TracChangeset for help on using the changeset viewer.