diff options
| author | David Robillard <d@drobilla.net> | 2011-01-08 15:28:48 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2011-01-08 15:28:48 +0000 |
| commit | 4c41b9240003e88c7dae7ba10dcca5ccd5a911dc (patch) | |
| tree | 6e79c9e5388d174b18a7706684f0e097a3abc430 /src/PortID.hpp | |
| parent | f8381e5fa077ad03e270b8697fa9d094c845fe14 (diff) | |
| download | patchage-4c41b9240003e88c7dae7ba10dcca5ccd5a911dc.tar.gz patchage-4c41b9240003e88c7dae7ba10dcca5ccd5a911dc.tar.bz2 patchage-4c41b9240003e88c7dae7ba10dcca5ccd5a911dc.zip | |
Fix configuration header define names to not stomp on global namespace.
git-svn-id: http://svn.drobilla.net/lad/trunk/patchage@2794 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/PortID.hpp')
| -rw-r--r-- | src/PortID.hpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/PortID.hpp b/src/PortID.hpp index b1f8444..35f8b53 100644 --- a/src/PortID.hpp +++ b/src/PortID.hpp @@ -23,7 +23,7 @@ #include "patchage-config.h" -#ifdef USE_LIBJACK +#ifdef PATCHAGE_LIBJACK #include <jack/jack.h> #endif #ifdef HAVE_ALSA @@ -40,7 +40,7 @@ struct PortID { enum { NULL_PORT_ID, JACK_ID, ALSA_ADDR } type; -#ifdef USE_LIBJACK +#ifdef PATCHAGE_LIBJACK PortID(jack_port_id_t jack_id, bool ign=false) : type(JACK_ID) { id.jack_id = jack_id; } #endif @@ -51,7 +51,7 @@ struct PortID { #endif union { -#ifdef USE_LIBJACK +#ifdef PATCHAGE_LIBJACK jack_port_id_t jack_id; #endif #ifdef HAVE_ALSA @@ -70,7 +70,7 @@ operator<<(std::ostream& os, const PortID& id) case PortID::NULL_PORT_ID: return os << "(null)"; case PortID::JACK_ID: -#ifdef USE_LIBJACK +#ifdef PATCHAGE_LIBJACK return os << "jack:" << id.id.jack_id; #endif break; @@ -94,7 +94,7 @@ operator<(const PortID& a, const PortID& b) case PortID::NULL_PORT_ID: return true; case PortID::JACK_ID: -#ifdef USE_LIBJACK +#ifdef PATCHAGE_LIBJACK return a.id.jack_id < b.id.jack_id; #endif break; |