SparkFun Si7021 and OSCMessage (OSCBundle) library conflict

[chaosmoon]

Hi, i'm in a little over my head here. When used separetly both libraries are working on an LC. If i try to use both i'm getting these errors:

libraries/SparkFun_Si7021_Humidity_and_Temperature_Sensor/src/SparkFun_Si7021_Breakout_Library.h:40:22: error: expected identifier before numeric constant
#define ADDRESS 0x40

libraries/OSC/OSCMessage.h:65:9: note: in expansion of macro 'ADDRESS'
ADDRESS,

..followed by a lot more.

These are the includes, disabling either will allow the sketch to compile:

#include "SparkFun_Si7021_Breakout_Library.h"
#include <Wire.h>

#include <OSCBundle.h>

Does anyone have any suggestions? I can post the whole output, but suspect it's initially going wrong with the ADRESS definition.

 

[chaosmoon]

hmm.. I wanted to post a failing sketch here and started to copy/paste parts of my sketch into a new one and now it's(the new sketch) working.

 

[chaosmoon]

It appears to be the order of declaration

#include "SparkFun_Si7021_Breakout_Library.h"
#include <OSCBundle.h>

void setup() {}
void loop() {}

will give errors.

#include <OSCBundle.h>
#include "SparkFun_Si7021_Breakout_Library.h"

void setup() {}
void loop() {}

will not.