Set up for using WPILib 2016
It works if you switch which line in //aos/externals:BUILD is commented
out.
Change-Id: I19f4d7a1d95554cff0dc29f9fd4a163b9d0cafd5
diff --git a/frc971/wpilib/wpilib_interface.cc b/frc971/wpilib/wpilib_interface.cc
index 68e0771..2129ec3 100644
--- a/frc971/wpilib/wpilib_interface.cc
+++ b/frc971/wpilib/wpilib_interface.cc
@@ -1,11 +1,12 @@
#include "frc971/wpilib/wpilib_interface.h"
-#include "DriverStation.h"
-#include "ControllerPower.h"
-
#include "aos/common/messages/robot_state.q.h"
#include "aos/common/logging/queue_logging.h"
+#include "DriverStation.h"
+#include "ControllerPower.h"
+#undef ERROR
+
namespace frc971 {
namespace wpilib {