Skip to content

Commit 0cbef75

Browse files
committed
ggml : fix MIN / MAX macro re-definition
1 parent 2cdfc4e commit 0cbef75

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

ggml.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -143,12 +143,6 @@ void ggml_print_backtrace(void) {
143143
}
144144
#endif
145145

146-
#undef MIN
147-
#undef MAX
148-
149-
#define MIN(a, b) ((a) < (b) ? (a) : (b))
150-
#define MAX(a, b) ((a) > (b) ? (a) : (b))
151-
152146
/*#define GGML_PERF*/
153147
#define GGML_DEBUG 0
154148
#define GGML_GELU_FP16
@@ -277,6 +271,12 @@ inline static void * ggml_aligned_malloc(size_t size) {
277271
// floating point type used to accumulate sums
278272
typedef double ggml_float;
279273

274+
#undef MIN
275+
#undef MAX
276+
277+
#define MIN(a, b) ((a) < (b) ? (a) : (b))
278+
#define MAX(a, b) ((a) > (b) ? (a) : (b))
279+
280280
//
281281
// global data
282282
//

0 commit comments

Comments
 (0)