Revert of With these changes, WebRtc x86 will build Visual Studio 2015.

webrtc/modules/audio_coding/codecs/isac/main/test/simpleKenny.c

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 /* kenny.c  - Main function for the iSAC coder */
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
 #ifdef WIN32
 #include "windows.h"
-#ifndef CLOCKS_PER_SEC
 #define CLOCKS_PER_SEC 1000
 #endif
-#endif
 
 #include <ctype.h>
 #include <math.h>
 
 /* include API */
 #include "isac.h"
 #include "utility.h"
 #include "webrtc/base/format_macros.h"
 //#include "commonDefs.h"
 
@@ skipping 179 matching lines @@
   if ((outp = fopen(outname, "wb")) == NULL) {
     printf("  iSAC: Cannot write file %s.\n", outname);
     exit(1);
   }
 
 #ifdef WIN32
   _splitpath(outname, outDrive, outPath, outPrefix, outSuffix);
   _makepath(bitrateFileName, outDrive, outPath, "bitrate", ".txt");
 
   bitrateFile = fopen(bitrateFileName, "a");
-  fprintf(bitrateFile, "%%  %s  \n", inname);
+  fprintf(bitrateFile, "%  %%s  \n", inname);
 #endif
 
   printf("\n");
   printf("Input.................... %s\n", inname);
   printf("Output................... %s\n", outname);
   printf("Encoding Mode............ %s\n",
          (codingMode == 1) ? "Channel-Independent" : "Channel-Adaptive");
   printf("Bottleneck............... %d bits/sec\n", bottleneck);
   printf("Packet-loss Percentage... %d\n", packetLossPercent);
   printf("\n");
@@ skipping 335 matching lines @@
   str->lastArrivalTime = 0;
 
   str->maxPayloadLB = 0;
   str->maxPayloadUB = 0;
   str->lbBytes = 0;
   str->ubBytes = 0;
 
   return 0;
 };
 #endif