1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-24 16:55:36 +03:00

Merge pull request #3426 from fishpepper/fix_multi_defines

removed triple definition of MIN/MAX macros
This commit is contained in:
Martin Budden 2017-07-03 20:43:20 +01:00 committed by GitHub
commit 0dae37dbf0
2 changed files with 2 additions and 5 deletions

View file

@ -1,8 +1,7 @@
#include <stdint.h>
#include "sdcard_standard.h"
#define MIN(a, b) ((a) < (b) ? (a) : (b))
#include "common/maths.h"
/**
* Read a bitfield from an array of bits (the bit at index 0 being the most-significant bit of the first byte in

View file

@ -28,6 +28,7 @@
#include "fat_standard.h"
#include "drivers/sdcard.h"
#include "common/maths.h"
#ifdef AFATFS_DEBUG
#define ONLY_EXPOSE_FOR_TESTING
@ -92,9 +93,6 @@
#define AFATFS_INTROSPEC_LOG_FILENAME "ASYNCFAT.LOG"
#define MIN(a, b) ((a) < (b) ? (a) : (b))
#define MAX(a, b) ((a) > (b) ? (a) : (b))
typedef enum {
AFATFS_SAVE_DIRECTORY_NORMAL,
AFATFS_SAVE_DIRECTORY_FOR_CLOSE,