Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
spaniakos committed Jan 9, 2015
2 parents 3e46b9a + dd7d04b commit ac63091
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions RF24Network_config.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,12 @@
#ifndef __RF24_CONFIG_H__
#define __RF24_CONFIG_H__

#if ARDUINO < 100
#include <WProgram.h>
#else
#include <Arduino.h>
#if defined (ARDUINO)
#if ARDUINO < 100
#include <WProgram.h>
#else
#include <Arduino.h>
#endif
#endif

#include <stddef.h>
Expand Down

0 comments on commit ac63091

Please sign in to comment.