smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-26 16:37:44 +01:00
Code Issues Projects Releases Wiki Activity

Add the 'porttime' source file for Windows

Browse source 
Conflicts:
	libs/backends/wavesaudio/portmidi/src/porttime/ptwinmm.c
This commit is contained in:
John Emmas 2014-05-06 09:25:27 +01:00 • committed by Paul Davis
parent 3dd30eef03
commit fbc9d19cb2
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libs/backends/wavesaudio/portmidi/src/porttime/ptwinmm.c
View file

@ -2,8 +2,14 @@
#include "porttime.h"
<<<<<<< HEAD
#include "windows.h"
#include "time.h"
=======
#include <windows.h>
#include <mmsystem.h>
#include <time.h>
>>>>>>> 41fe637... Add the 'porttime' source file for Windows
TIMECAPS caps;