13
0

Undef SearchPath where needed as it is defined via windows.h

This is pretty annoying, might even be worth renaming the class
This commit is contained in:
Paul Davis 2013-07-11 14:27:24 -04:00
parent 4d71933f5b
commit b6afce39a4
5 changed files with 21 additions and 0 deletions

View File

@ -38,6 +38,10 @@
#include "ardour/types.h"
#include "ardour/export_handler.h"
#ifdef SearchPath
#undef SearchPath
#endif
namespace ARDOUR
{

View File

@ -22,6 +22,10 @@
#include "pbd/search_path.h"
#ifdef SearchPath
#undef SearchPath
#endif
namespace ARDOUR {
/**

View File

@ -28,6 +28,11 @@
#include "ardour/debug.h"
#include "ardour/panner_manager.h"
#ifdef SearchPath
#undef SearchPath
#endif
#include "ardour/panner_search_path.h"
#include "i18n.h"

View File

@ -32,6 +32,10 @@
#include "ardour/filename_extensions.h"
#include "ardour/io.h"
#ifdef SearchPath
#undef SearchPath
#endif
using namespace std;
using namespace PBD;

View File

@ -20,6 +20,10 @@
#ifndef PBD_SEARCH_PATH_INCLUDED
#define PBD_SEARCH_PATH_INCLUDED
#ifdef SearchPath
#undef SearchPath
#endif
#include <string>
#include <vector>