X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Fmultiop.c;h=b42bfb806b45b0c6208833adde52a1df4f4850ec;hp=28d5ecd99cf6ad79c2106e769db7269674af7dbf;hb=938a12769147505c7e42908df89733be19982205;hpb=dff4f6242eca722741fcee53d867ef07c6817621

diff --git a/lustre/tests/multiop.c b/lustre/tests/multiop.c
index 28d5ecd..b42bfb8 100755
--- a/lustre/tests/multiop.c
+++ b/lustre/tests/multiop.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 /*
@@ -181,7 +181,6 @@ int get_flags(char *data, int *rflags)
 }
 
 #define POP_ARG() (pop_arg(argc, argv))
-#define min(a,b) ((a)>(b)?(b):(a))
 
 int main(int argc, char **argv)
 {