Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix warnings due to extra tokens at end of #ifndef directive #2

Merged
merged 1 commit into from
Nov 17, 2018
Merged

Fix warnings due to extra tokens at end of #ifndef directive #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions src/TimeOut.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,17 @@
#define TIMEOUT_UNDELETABLE 2 //timer cannot be cleared
//#define TIMEOUT_LOCK_UNDELETABLE 3 //removed //timer cannot be overwriten or cleared

#ifndef sc(x)
#ifndef sc
#define sc(x)(x*1000UL)
#endif
#endif /* sc */

#ifndef mn(x)
#ifndef mn
#define mn(x)(x*60000UL)
#endif
#endif /* mn */

#ifndef hr(x)
#ifndef hr
#define hr(x)(x*3600000UL)
#endif
#endif /* hr */


class TimeOut;
Expand Down Expand Up @@ -122,4 +122,4 @@ class Interval {
uint8_t _num;
};

#endif
#endif