Skip to content
This repository was archived by the owner on Aug 19, 2021. It is now read-only.

Rename events.h -> mbed_events.h to avoid potential name collisions #7

Merged
merged 1 commit into from
Jul 30, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion EventLoop.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifdef MBED_CONF_RTOS_PRESENT
#include "EventLoop.h"

#include "events.h"
#include "mbed_events.h"
#include "rtos.h"
#include "mbed.h"

Expand Down
2 changes: 1 addition & 1 deletion EventQueue.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "EventQueue.h"

#include "events.h"
#include "mbed_events.h"
#include "mbed.h"


Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
The events library provides a flexible event queue for scheduling events.

``` cpp
#include "events.h"
#include "mbed_events.h"
#include <stdio.h>

int main() {
Expand Down
2 changes: 1 addition & 1 deletion TESTS/events/queue/main.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "events.h"
#include "mbed_events.h"
#include "mbed.h"
#include "rtos.h"
#include "greentea-client/test_env.h"
Expand Down
4 changes: 2 additions & 2 deletions events.h → mbed_events.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef EVENTS_CPP_H
#define EVENTS_CPP_H
#ifndef MBED_EVENTS_H
#define MBED_EVENTS_H


#include "events-c/events.h"
Expand Down