diff options
| author | John Emmas <johne53@tiscali.co.uk> | 2013-07-31 15:09:50 +0100 |
|---|---|---|
| committer | John Emmas <johne53@tiscali.co.uk> | 2013-07-31 15:09:50 +0100 |
| commit | 98c6ca5abcb8901f70b2790ecd9cec51385fab6b (patch) | |
| tree | 74e5d42c37f7f5a68d4bf4176170e0ce9df88018 /gtk2_ardour/video_server_dialog.cc | |
| parent | 1828f5694fc8a5971fb8f4f58d8b9abc05434c63 (diff) | |
| parent | b889a3d2f999dc97f21bbba4603ccdc349ba5bf2 (diff) | |
Merge branch 'windows' of git.ardour.org:ardour/ardour into windows
Diffstat (limited to 'gtk2_ardour/video_server_dialog.cc')
| -rw-r--r-- | gtk2_ardour/video_server_dialog.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/gtk2_ardour/video_server_dialog.cc b/gtk2_ardour/video_server_dialog.cc index 8838409ccf..468bcc5c8d 100644 --- a/gtk2_ardour/video_server_dialog.cc +++ b/gtk2_ardour/video_server_dialog.cc @@ -29,10 +29,18 @@ #include "ardour/template_utils.h" #include "ardour/session.h" +#ifdef interface +#undef interface +#endif + #include "video_server_dialog.h" #include "utils_videotl.h" #include "i18n.h" +#ifdef SearchPath +#undef SearchPath +#endif + using namespace Gtk; using namespace std; using namespace PBD; |