diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-01-26 02:24:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-01-26 02:24:22 +0000 |
| commit | 95eafbaf0a6363ed56ea9454c06efea90ee15cc5 (patch) | |
| tree | c4332363ce3d1bf3bd7382b03e5cf3d540419ddf | |
| parent | 3b680bb63e1063a8d81c7da16a90cb6102de4a0d (diff) | |
| parent | d43cc68c4d4053f8b9855462e428b0749c088a17 (diff) | |
| download | extras-95eafbaf0a6363ed56ea9454c06efea90ee15cc5.tar.gz | |
Merge "Do not add macro min() definition for C++"
| -rw-r--r-- | ext4_utils/include/ext4_utils/ext4_utils.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext4_utils/include/ext4_utils/ext4_utils.h b/ext4_utils/include/ext4_utils/ext4_utils.h index 0fbbdd31..75c72bbf 100644 --- a/ext4_utils/include/ext4_utils/ext4_utils.h +++ b/ext4_utils/include/ext4_utils/ext4_utils.h @@ -57,9 +57,11 @@ extern int force; #define EXT4_JNL_BACKUP_BLOCKS 1 +#ifndef __cplusplus #ifndef min /* already defined by windows.h */ #define min(a, b) ((a) < (b) ? (a) : (b)) #endif +#endif #define DIV_ROUND_UP(x, y) (((x) + (y) - 1)/(y)) #define EXT4_ALIGN(x, y) ((y) * DIV_ROUND_UP((x), (y))) |