mirror of https://github.com/ArduPilot/ardupilot
Try to pre-empt subsequent inclusions of wiring.h by grabbing it here and giving ourselves a chance to undo some of the less well-advised macros it defines.
git-svn-id: https://arducopter.googlecode.com/svn/trunk@1554 f9c3cf11-9bcb-44bc-f272-b75c42450872
This commit is contained in:
parent
95d6e2cac0
commit
0913a26513
|
@ -15,6 +15,12 @@
|
||||||
#ifndef _AP_COMMON_H
|
#ifndef _AP_COMMON_H
|
||||||
#define _AP_COMMON_H
|
#define _AP_COMMON_H
|
||||||
|
|
||||||
|
// Get the common arduino functions
|
||||||
|
#include "wiring.h"
|
||||||
|
// ... and remove some of their stupid macros
|
||||||
|
#undef round
|
||||||
|
#undef abs
|
||||||
|
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include "include/menu.h" /// simple menu subsystem
|
#include "include/menu.h" /// simple menu subsystem
|
||||||
#include "c++.h" // c++ additions
|
#include "c++.h" // c++ additions
|
||||||
|
@ -22,6 +28,8 @@
|
||||||
//#include "AP_Loop.h"
|
//#include "AP_Loop.h"
|
||||||
#include "AP_Var.h"
|
#include "AP_Var.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
/// @name Warning control
|
/// @name Warning control
|
||||||
//@{
|
//@{
|
||||||
|
|
Loading…
Reference in New Issue