Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Branch HEAD
[fs/lustre-release.git]
/
libcfs
/
include
/
libcfs
/
user-prim.h
diff --git
a/libcfs/include/libcfs/user-prim.h
b/libcfs/include/libcfs/user-prim.h
index
711bb67
..
a5c4213
100644
(file)
--- a/
libcfs/include/libcfs/user-prim.h
+++ b/
libcfs/include/libcfs/user-prim.h
@@
-178,6
+178,14
@@
struct cfs_stack_trace {
})
#endif
+#ifndef min
+# define min(x,y) ((x)<(y) ? (x) : (y))
+#endif
+
+#ifndef max
+# define max(x,y) ((x)>(y) ? (x) : (y))
+#endif
+
/* utility libcfs init/fini entries */
#ifdef __WINNT__
extern int libcfs_arch_init(void);