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:
parent
4d71933f5b
commit
b6afce39a4
@ -38,6 +38,10 @@
|
||||
#include "ardour/types.h"
|
||||
#include "ardour/export_handler.h"
|
||||
|
||||
#ifdef SearchPath
|
||||
#undef SearchPath
|
||||
#endif
|
||||
|
||||
namespace ARDOUR
|
||||
{
|
||||
|
||||
|
@ -22,6 +22,10 @@
|
||||
|
||||
#include "pbd/search_path.h"
|
||||
|
||||
#ifdef SearchPath
|
||||
#undef SearchPath
|
||||
#endif
|
||||
|
||||
namespace ARDOUR {
|
||||
|
||||
/**
|
||||
|
@ -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"
|
||||
|
@ -32,6 +32,10 @@
|
||||
#include "ardour/filename_extensions.h"
|
||||
#include "ardour/io.h"
|
||||
|
||||
#ifdef SearchPath
|
||||
#undef SearchPath
|
||||
#endif
|
||||
|
||||
using namespace std;
|
||||
using namespace PBD;
|
||||
|
||||
|
@ -20,6 +20,10 @@
|
||||
#ifndef PBD_SEARCH_PATH_INCLUDED
|
||||
#define PBD_SEARCH_PATH_INCLUDED
|
||||
|
||||
#ifdef SearchPath
|
||||
#undef SearchPath
|
||||
#endif
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user