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

    r21570 r21916  
    3434#include "waveoutdart.h"
    3535#include "winmm.h"
    36 #include "initwinmm.h"
     36#include "initterm.h"
    3737#include "mixer.h"
    3838#include "mixeros2.h"
    … …  
    749749        //find line associated with this control
    750750        lpMlc->dwLineID = -1;
    751         for(int i=0;i<nrLines;i++) {
     751        int i;
     752        for(i=0;i<nrLines;i++) {
    752753            for(int j=0;j<pmixerLines[i]->cControls;j++) {
    753754                if(pmixerLines[i]->Controls[j] == lpMlc->u.dwControlID) {
    … …  
    10861087#endif
    10871088        //search all lines (src & dest) for one with specified type
    1088         for(int i=0;i<nrLines;i++) {
     1089        int i;
     1090        for(i=0;i<nrLines;i++) {
    10891091            if(pmixerLines[i]->line.dwComponentType == lpMl->dwComponentType) {
    10901092                break;
    … …  
    11301132        //TODO: Should we compare mid, pid & pddname too? (must be initialized according to MSDN)
    11311133        //      (see below; unicode version doesn't copy pddname; change if these checks are required)
     1134        int i;
    11321135        for(int i=0;i<nrLines;i++) {
    11331136            if(pmixerLines[i]->line.Target.dwType == lpMl->Target.dwType) {
    … …  
    13711374
    13721375    memset(mixerDest, 0, sizeof(mixerDest));
    1373     for(int i=0;i<MIXER_DEST_MAX;i++) {
     1376    int i;
     1377    for(i=0;i<MIXER_DEST_MAX;i++) {
    13741378        memset(mixerDest[i].Connections, -1, sizeof(mixerDest[i].Connections));
    13751379        memset(mixerDest[i].Controls, -1, sizeof(mixerDest[i].Controls));
Note: See TracChangeset for help on using the changeset viewer.