mirror of
https://github.com/apache/nuttx.git
synced 2026-06-04 06:42:32 +08:00
nuttx: Use MIN/MAX definitions from "sys/param.h"
Signed-off-by: Gustavo Henrique Nihei <gustavo.nihei@espressif.com>
This commit is contained in:
committed by
Xiang Xiao
parent
079e2b8c7c
commit
e6b204f438
@@ -31,10 +31,6 @@
|
||||
#include <crypto/aes.h>
|
||||
#include <crypto/cmac.h>
|
||||
|
||||
#ifndef MIN
|
||||
# define MIN(a,b) ((a) < (b) ? (a) : (b))
|
||||
#endif
|
||||
|
||||
#define LSHIFT(v, r) do \
|
||||
{ \
|
||||
int i; \
|
||||
|
||||
+1
-2
@@ -32,6 +32,7 @@
|
||||
#include <crypto/cryptodev.h>
|
||||
#include <crypto/cryptosoft.h>
|
||||
#include <crypto/xform.h>
|
||||
#include <sys/param.h>
|
||||
|
||||
/****************************************************************************
|
||||
* Pre-processor Definitions
|
||||
@@ -41,8 +42,6 @@
|
||||
# define howmany(x, y) (((x) + ((y) - 1)) / (y))
|
||||
#endif
|
||||
|
||||
#define MIN(a,b) (((a) < (b)) ? (a) : (b))
|
||||
|
||||
/****************************************************************************
|
||||
* Private Data
|
||||
****************************************************************************/
|
||||
|
||||
@@ -27,6 +27,7 @@
|
||||
#include <stdint.h>
|
||||
#include <stdbool.h>
|
||||
#include <string.h>
|
||||
#include <sys/param.h>
|
||||
#include <debug.h>
|
||||
#include <assert.h>
|
||||
#include <errno.h>
|
||||
@@ -41,10 +42,6 @@
|
||||
* Pre-processor Definitions
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef MIN
|
||||
# define MIN(a,b) ((a) < (b) ? (a) : (b))
|
||||
#endif
|
||||
|
||||
#define ROTL_32(x,n) (((x) << (n)) | ((x) >> (32 - (n))))
|
||||
#define ROTR_32(x,n) (((x) >> (n)) | ((x) << (32 - (n))))
|
||||
|
||||
|
||||
Reference in New Issue
Block a user