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/ddraw/ddmain.cpp

    r21494 r21916  
    7979  dprintf(("DDRAW: DirectDrawEnumerateA\n Callback for DIVE"));
    8080  //call it twice for the DirectDraw & Direct3D classes
    81  if(lpCallback(NULL, "DIVE DirectDraw for OS/2",
    82                 "DirectDraw/2 v0.4", lpContext) == DDENUMRET_CANCEL)
     81 if(lpCallback(NULL, (LPSTR)"DIVE DirectDraw for OS/2",
     82                (LPSTR)"DirectDraw/2 v0.4", lpContext) == DDENUMRET_CANCEL)
    8383  {
    8484    dprintf(("DDRAW: Cancel Callback"));
    … …  
    9191  {
    9292    dprintf(("DDRAW: Callback for 3Dfx Voodoo"));
    93     if(lpCallback((GUID *)&IID_IDirect3D, "3Dfx Voodoo Direct3D/2",
    94       "Direct3D/2 v0.2", lpContext) == DDENUMRET_CANCEL)
     93    if(lpCallback((GUID *)&IID_IDirect3D, (LPSTR)"3Dfx Voodoo Direct3D/2",
     94      (LPSTR)"Direct3D/2 v0.2", lpContext) == DDENUMRET_CANCEL)
    9595    {
    9696      dprintf(("DDRAW: Cancel Callback"));
Note: See TracChangeset for help on using the changeset viewer.