Skip to content

Commit

Permalink
Merge pull request #258 from TheThingsNetwork/bug/pb_global_includes
Browse files Browse the repository at this point in the history
pb.h should be included from the local directory
  • Loading branch information
johanstokking authored Jul 15, 2019
2 parents 629e613 + 332fde3 commit e3115cc
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions src/TheThingsMessage.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
#define _THETHINGSMESSAGE_H_

#include "TheThingsNetwork.h"
#include <pb.h>
#include <pb_encode.h>
#include <pb_decode.h>
#include "pb.h"
#include "pb_encode.h"
#include "pb_decode.h"
#include "deviceData.pb.h"
#include "appData.pb.h"

Expand Down
2 changes: 1 addition & 1 deletion src/appData.pb.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#ifndef PB_API_APPDATA_PB_H_INCLUDED
#define PB_API_APPDATA_PB_H_INCLUDED
#include <pb.h>
#include "pb.h"

/* @@protoc_insertion_point(includes) */
#if PB_PROTO_HEADER_VERSION != 30
Expand Down
2 changes: 1 addition & 1 deletion src/deviceData.pb.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#ifndef PB_API_DEVICEDATA_PB_H_INCLUDED
#define PB_API_DEVICEDATA_PB_H_INCLUDED
#include <pb.h>
#include "pb.h"

/* @@protoc_insertion_point(includes) */
#if PB_PROTO_HEADER_VERSION != 30
Expand Down

0 comments on commit e3115cc

Please sign in to comment.