LU-2456 lnet: DLC Feature dynamic net config

[fs/lustre-release.git] / lustre / include / darwin / lustre_user.h

diff --git a/lustre/include/darwin/lustre_user.h b/lustre/include/darwin/lustre_user.h
index a495e60..5c219bf 100644 (file)
--- a/lustre/include/darwin/lustre_user.h
+++ b/lustre/include/darwin/lustre_user.h
@@ -1,7 +1,37 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
+/*
+ * GPL HEADER START
  *
- *   This file is part of Lustre, http://www.lustre.org
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 only,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License version 2 for more details (a copy is included
+ * in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; If not, see
+ * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ * GPL HEADER END
+ */
+/*
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Use is subject to license terms.
+ */
+/*
+ * This file is part of Lustre, http://www.lustre.org/
+ * Lustre is a trademark of Sun Microsystems, Inc.
+ *
+ * lustre/include/darwin/lustre_user.h
  *
  * Lustre public user-space interface definitions.
  */
@@ -9,11 +39,8 @@
 #ifndef _DARWIN_LUSTRE_USER_H
 #define _DARWIN_LUSTRE_USER_H
 
-#include <lustre/types.h>
-
 #ifndef __KERNEL__
 /* for llmount */
-# define _GNU_SOURCE
 # include <getopt.h>
 # include <sys/utsname.h>
 # include <sys/stat.h>
@@ -33,14 +60,12 @@ typedef struct stat     lstat_t;
 # define LPU64 "%llu"
 # define LPD64 "%lld"
 # define LPX64 "%#llx"
-# define LPSZ  "%u"
-# define LPSSZ "%d"
+# define LPO64 "%#llo"
 #elif (BITS_PER_LONG == 64 || __WORDSIZE == 64)
 # define LPU64 "%lu"
 # define LPD64 "%ld"
 # define LPX64 "%#lx"
-# define LPSZ  "%lu"
-# define LPSSZ "%ld"
+# define LPO64 "%#lo"
 #endif
 #endif /* !LPU64 */