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/winmm/waveoutdart.cpp

    r21358 r21916  
    3333#include "misc.h"
    3434#include "waveoutdart.h"
    35 #include "initwinmm.h"
     35#include "initterm.h"
    3636
    3737#define DBG_LOCALLOG    DBG_waveoutdart
    … …  
    759759    dprintf2(("WaveOutHandler %x %x %x", ulStatus, pBuffer, ulFlags));
    760760
     761#ifdef __IBMC__
    761762    ptib2 = (PTIB2)_getTIBvalue(offsetof(TIB, tib_ptib2));
     763#else
     764    PTIB ptib;
     765    DosGetInfoBlocks(&ptib, NULL);
     766    ptib2 = ptib->tib_ptib2;
     767#endif
     768
    762769    if (ptib2 && HIBYTE(ptib2->tib2_ulpri) != PRTYC_TIMECRITICAL &&
    763770       LOBYTE(ptib2->tib2_ulpri) != PRTYD_MAXIMUM)
Note: See TracChangeset for help on using the changeset viewer.