diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-09-27 14:52:53 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-09-27 14:52:53 +0000 |
| commit | a57b429dc97cfb483442a853fcab688d437d351a (patch) | |
| tree | 984cf896bb62272d20d42cd15042e8a364578529 | |
| parent | e6b2776e8a020470a07e6423d7cf58164f6ae0c1 (diff) | |
some header-file rearrangements to get JACK weak linkage working correctly
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@10142 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | libs/ardour/ardour/audioengine.h | 6 | ||||
| -rw-r--r-- | libs/ardour/audioengine.cc | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/libs/ardour/ardour/audioengine.h b/libs/ardour/ardour/audioengine.h index e855411a48..03b244d474 100644 --- a/libs/ardour/ardour/audioengine.h +++ b/libs/ardour/ardour/audioengine.h @@ -30,11 +30,13 @@ #include <glibmm/thread.h> +#include <jack/weakjack.h> +#include <jack/jack.h> +#include <jack/transport.h> + #include <pbd/rcu.h> #include <ardour/ardour.h> -#include <jack/jack.h> -#include <jack/transport.h> #include <ardour/types.h> #include <ardour/data_type.h> diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc index bbe188590d..7e373a2b3c 100644 --- a/libs/ardour/audioengine.cc +++ b/libs/ardour/audioengine.cc @@ -25,7 +25,6 @@ #include <boost/scoped_ptr.hpp> #include <glibmm/timer.h> -#include <jack/weakjack.h> #include <pbd/pthread_utils.h> #include <pbd/stacktrace.h> #include <pbd/epa.h> |