Fix --no-nls (4/5), i18n include order in libs/*
"i18n.h" needs to be included last (after any includes that may indirectly pull in getext or libintl etc)
This commit is contained in:
parent
dade5fca7d
commit
357361c89d
|
@ -27,7 +27,6 @@
|
|||
#include <boost/shared_ptr.hpp>
|
||||
|
||||
#include "pbd/stateful.h"
|
||||
#include "pbd/i18n.h"
|
||||
|
||||
#include "ardour/presentation_info.h"
|
||||
#include "ardour/types.h"
|
||||
|
|
|
@ -20,13 +20,13 @@
|
|||
#include <iostream>
|
||||
#include <cerrno>
|
||||
|
||||
#include "pbd/i18n.h"
|
||||
|
||||
#include "ardour/audioengine.h"
|
||||
#include "ardour/audio_backend.h"
|
||||
#include "ardour/session.h"
|
||||
#include "ardour/transport_master.h"
|
||||
|
||||
#include "pbd/i18n.h"
|
||||
|
||||
using namespace std;
|
||||
using namespace ARDOUR;
|
||||
|
||||
|
|
|
@ -30,6 +30,8 @@
|
|||
#include "ardour/session.h"
|
||||
#include "ardour/stripable.h"
|
||||
|
||||
#include "pbd/i18n.h"
|
||||
|
||||
using namespace ARDOUR;
|
||||
using namespace PBD;
|
||||
|
||||
|
|
|
@ -23,7 +23,6 @@
|
|||
#include "pbd/error.h"
|
||||
#include "pbd/memento_command.h"
|
||||
#include "pbd/types_convert.h"
|
||||
#include "pbd/i18n.h"
|
||||
|
||||
#include "evoral/Curve.hpp"
|
||||
|
||||
|
@ -32,6 +31,8 @@
|
|||
#include "ardour/slavable_automation_control.h"
|
||||
#include "ardour/session.h"
|
||||
|
||||
#include "pbd/i18n.h"
|
||||
|
||||
using namespace std;
|
||||
using namespace ARDOUR;
|
||||
using namespace PBD;
|
||||
|
|
|
@ -20,7 +20,6 @@
|
|||
#include <vector>
|
||||
|
||||
#include "pbd/debug.h"
|
||||
#include "pbd/i18n.h"
|
||||
|
||||
#include "ardour/audioengine.h"
|
||||
#include "ardour/midi_port.h"
|
||||
|
@ -30,6 +29,8 @@
|
|||
#include "ardour/types_convert.h"
|
||||
#include "ardour/utils.h"
|
||||
|
||||
#include "pbd/i18n.h"
|
||||
|
||||
namespace ARDOUR {
|
||||
namespace Properties {
|
||||
PBD::PropertyDescriptor<bool> fr2997;
|
||||
|
|
|
@ -16,14 +16,14 @@
|
|||
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
|
||||
#include "pbd/i18n.h"
|
||||
|
||||
#include "ardour/audioengine.h"
|
||||
#include "ardour/debug.h"
|
||||
#include "ardour/disk_reader.h"
|
||||
#include "ardour/session.h"
|
||||
#include "ardour/transport_master_manager.h"
|
||||
|
||||
#include "pbd/i18n.h"
|
||||
|
||||
#if __cplusplus > 199711L
|
||||
#define local_signbit(x) std::signbit (x)
|
||||
#else
|
||||
|
|
|
@ -37,7 +37,6 @@
|
|||
#include "pbd/error.h"
|
||||
#include "pbd/failed_constructor.h"
|
||||
#include "pbd/file_utils.h"
|
||||
#include "pbd/i18n.h"
|
||||
#include "pbd/strsplit.h"
|
||||
#include "pbd/types_convert.h"
|
||||
#include "pbd/xml++.h"
|
||||
|
|
|
@ -25,7 +25,6 @@
|
|||
|
||||
#include "pbd/compose.h"
|
||||
#include "pbd/error.h"
|
||||
#include "pbd/i18n.h"
|
||||
|
||||
#include "ardour/debug.h"
|
||||
|
||||
|
@ -33,6 +32,8 @@
|
|||
#include "layout.h"
|
||||
#include "push2.h"
|
||||
|
||||
#include "pbd/i18n.h"
|
||||
|
||||
#ifdef __APPLE__
|
||||
#define Rect ArdourCanvas::Rect
|
||||
#endif
|
||||
|
|
|
@ -21,8 +21,6 @@
|
|||
#include <cairomm/region.h>
|
||||
#include <pangomm/layout.h>
|
||||
|
||||
#include "pbd/i18n.h"
|
||||
|
||||
#include "canvas/text.h"
|
||||
#include "canvas/types.h"
|
||||
#include "canvas/rectangle.h"
|
||||
|
@ -34,6 +32,8 @@
|
|||
|
||||
#include "menu.h"
|
||||
|
||||
#include "pbd/i18n.h"
|
||||
|
||||
#ifdef __APPLE__
|
||||
#define Rect ArdourCanvas::Rect
|
||||
#endif
|
||||
|
|
|
@ -15,9 +15,6 @@
|
|||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
|
||||
#include "pbd/i18n.h"
|
||||
|
||||
#include "gtkmm2ext/gui_thread.h"
|
||||
|
||||
#include "gtkmm2ext/colors.h"
|
||||
|
@ -29,6 +26,8 @@
|
|||
#include "push2.h"
|
||||
#include "scale.h"
|
||||
|
||||
#include "pbd/i18n.h"
|
||||
|
||||
#ifdef __APPLE__
|
||||
#define Rect ArdourCanvas::Rect
|
||||
#endif
|
||||
|
|
|
@ -21,7 +21,6 @@
|
|||
#include "pbd/compose.h"
|
||||
#include "pbd/failed_constructor.h"
|
||||
#include "pbd/file_utils.h"
|
||||
#include "pbd/i18n.h"
|
||||
#include "pbd/search_path.h"
|
||||
|
||||
#include "ardour/debug.h"
|
||||
|
@ -29,6 +28,8 @@
|
|||
|
||||
#include "splash.h"
|
||||
|
||||
#include "pbd/i18n.h"
|
||||
|
||||
#ifdef __APPLE__
|
||||
#define Rect ArdourCanvas::Rect
|
||||
#endif
|
||||
|
|
|
@ -24,7 +24,6 @@
|
|||
#include "pbd/debug.h"
|
||||
#include "pbd/failed_constructor.h"
|
||||
#include "pbd/file_utils.h"
|
||||
#include "pbd/i18n.h"
|
||||
#include "pbd/search_path.h"
|
||||
#include "pbd/enumwriter.h"
|
||||
|
||||
|
@ -66,6 +65,8 @@
|
|||
#include "track_mix.h"
|
||||
#include "utils.h"
|
||||
|
||||
#include "pbd/i18n.h"
|
||||
|
||||
#ifdef __APPLE__
|
||||
#define Rect ArdourCanvas::Rect
|
||||
#endif
|
||||
|
|
Loading…
Reference in New Issue
Block a user