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/user32/pmwindow.cpp

    r21556 r21916  
    3232#include <wprocess.h>
    3333#include <dbglog.h>
    34 #include <win32wbase.h>
    35 #include <win32wfake.h>
    36 #include <win32dlg.h>
     34#include "win32wbase.h"
     35#include "win32wfake.h"
     36#include "win32dlg.h"
    3737#include "win32wdesktop.h"
    3838#include "pmwindow.h"
    … …  
    5757#include <oslibdnd.h>
    5858#include <custombuild.h>
    59 #include <win\dbt.h>
     59#include <win/dbt.h>
    6060#include "dragdrop.h"
    6161#include "menu.h"
    … …  
    257257    HDC   hdc;              /* Device-context handle                */
    258258    /* context data structure */
    259     DEVOPENSTRUC dop = {NULL, "DISPLAY", NULL, NULL, NULL, NULL,
     259    DEVOPENSTRUC dop = {NULL, (PSZ)"DISPLAY", NULL, NULL, NULL, NULL,
    260260                        NULL, NULL, NULL};
    261261
    … …  
    328328        HMODULE hModDisplay;
    329329        HDC   hdc;              /* Device-context handle                */
    330         DEVOPENSTRUC dop = {NULL, "DISPLAY", NULL, NULL, NULL, NULL,
     330        DEVOPENSTRUC dop = {NULL, (PSZ)"DISPLAY", NULL, NULL, NULL, NULL,
    331331                            NULL, NULL, NULL};
    332332
    … …  
    25262526PVOID PMWinSubclassFakeWindow(HWND hwndOS2)
    25272527{
    2528     return WinSubclassWindow(hwndOS2, Win32FakeWindowProc);
     2528    return (PVOID)WinSubclassWindow(hwndOS2, Win32FakeWindowProc);
    25292529}
    25302530//******************************************************************************
    … …  
    27472747//******************************************************************************
    27482748//******************************************************************************
    2749 char *WIN32API QueryCustomStdClassName()
     2749const char *WIN32API QueryCustomStdClassName()
    27502750{
    27512751   return WIN32_STDCLASS;
Note: See TracChangeset for help on using the changeset viewer.