Browse Source

Ensure MIN/MAX overrides

pull/1/head
Scott Lahteine 6 years ago
parent
commit
f4c625d3a1
  1. 7
      Marlin/src/core/minmax.h
  2. 1
      Marlin/src/inc/MarlinConfig.h
  3. 2
      frameworks/CMSIS/LPC1768/include/lpc_types.h

7
Marlin/src/core/minmax.h

@ -20,13 +20,14 @@
*
*/
#pragma once
#undef MIN
#undef MAX
#ifdef __cplusplus
#ifndef _MINMAX_H_
#define _MINMAX_H_
extern "C++" {
// C++11 solution that is standards compliant. Return type is deduced automatically
@ -41,6 +42,8 @@
}
#endif
#else
// NUM_ARGS(...) evaluates to the number of arguments

1
Marlin/src/inc/MarlinConfig.h

@ -43,5 +43,6 @@
#include "../core/language.h"
#include "../core/utility.h"
#include "../core/serial.h"
#include "../core/minmax.h"
#endif // _MARLIN_CONFIG_H_

2
frameworks/CMSIS/LPC1768/include/lpc_types.h

@ -145,8 +145,6 @@ typedef int32_t(*PFI)();
/* External data/function define */
#define EXTERN extern
#include "../../../../src/core/minmax.h"
/**
* @}
*/

Loading…
Cancel
Save