Skip to content

Commit 56e13aa

Browse files
authored
Merge pull request #557 from matthijskooijman/remove-no-expansion-to-defined
Remove -Wno-expansion-to-defined
2 parents 25fea52 + 32f7ac6 commit 56e13aa

File tree

7 files changed

+8
-8
lines changed

7 files changed

+8
-8
lines changed

cores/arduino/Arduino.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ extern "C"{
3131
#endif // __cplusplus
3232

3333
// Include Atmel headers
34-
#include "sam.h"
34+
#include <samd.h>
3535

3636
#define clockCyclesPerMicrosecond() ( SystemCoreClock / 1000000L )
3737
#define clockCyclesToMicroseconds(a) ( ((a) * 1000L) / (SystemCoreClock / 1000L) )

cores/arduino/SERCOM.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#ifndef _SERCOM_CLASS_
2020
#define _SERCOM_CLASS_
2121

22-
#include "sam.h"
22+
#include <samd.h>
2323

2424
#define SERCOM_FREQ_REF 48000000
2525
#define SERCOM_NVIC_PRIORITY ((1<<__NVIC_PRIO_BITS) - 1)

cores/arduino/WVariant.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#pragma once
2020

2121
#include <stdint.h>
22-
#include "sam.h"
22+
#include <samd.h>
2323

2424
#ifdef __cplusplus
2525
extern "C" {

cores/arduino/cortex_handlers.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1717
*/
1818

19-
#include <sam.h>
19+
#include <samd.h>
2020
#include <variant.h>
2121
#include <stdio.h>
2222

cores/arduino/startup.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1717
*/
1818

19-
#include "sam.h"
19+
#include <samd.h>
2020
#include "variant.h"
2121

2222
#include <stdio.h>

cores/arduino/wiring_private.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ extern "C" {
2727
#endif
2828

2929
// Includes Atmel CMSIS
30-
#include "sam.h"
30+
#include <samd.h>
3131

3232
int pinPeripheral( uint32_t ulPin, EPioType ulPeripheral );
3333

platform.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ version=1.8.9
2828
compiler.warning_flags=-w
2929
compiler.warning_flags.none=-w
3030
compiler.warning_flags.default=
31-
compiler.warning_flags.more=-Wall -Wno-expansion-to-defined
32-
compiler.warning_flags.all=-Wall -Wextra -Wno-expansion-to-defined
31+
compiler.warning_flags.more=-Wall
32+
compiler.warning_flags.all=-Wall -Wextra
3333

3434
# EXPERIMENTAL feature: optimization flags
3535
# - this is alpha and may be subject to change without notice

0 commit comments

Comments
 (0)