From b3bea2eb3e596e581b7cd974c4999abee41e4d5c Mon Sep 17 00:00:00 2001 From: "andrew@webrtc.org" Date: Fri, 18 May 2012 19:02:42 +0000 Subject: [PATCH] Fix build errors on OS X Lion. TBR=henrika@webrtc.org TEST=build on Lion, trybots Review URL: https://webrtc-codereview.appspot.com/583005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@2261 4adac7df-926f-26a2-2b94-8c16560cd09d --- src/modules/audio_coding/neteq/test/NetEqRTPplay.cc | 4 +++- .../main/source/Mac/QTKit/video_capture_qtkit_info_objc.mm | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/modules/audio_coding/neteq/test/NetEqRTPplay.cc b/src/modules/audio_coding/neteq/test/NetEqRTPplay.cc index cfcbaefce5..7525a40d72 100644 --- a/src/modules/audio_coding/neteq/test/NetEqRTPplay.cc +++ b/src/modules/audio_coding/neteq/test/NetEqRTPplay.cc @@ -10,9 +10,11 @@ //TODO(hlundin): Reformat file to meet style guide. +#include +#include + /* header includes */ #include "typedefs.h" -#include "stdio.h" #include "webrtc_neteq.h" #include "webrtc_neteq_internal.h" #include "webrtc_neteq_help_macros.h" diff --git a/src/modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit_info_objc.mm b/src/modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit_info_objc.mm index 23b65bd477..f40131c372 100644 --- a/src/modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit_info_objc.mm +++ b/src/modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit_info_objc.mm @@ -57,7 +57,7 @@ using namespace webrtc; { NSString* strTitle = [NSString stringWithFormat:@"%s", dialogTitleUTF8]; NSString* strButton = @"Alright"; - NSString* strMessage = [NSString stringWithFormat:@"Device %s is capturing:\nWidth:%d\n:Height:%d\n@%dfps", deviceUniqueIdUTF8]; + NSString* strMessage = [NSString stringWithFormat:@"Device %s is capturing", deviceUniqueIdUTF8]; NSAlert* alert = [NSAlert alertWithMessageText:strTitle defaultButton:strButton alternateButton:nil otherButton:nil