X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lnet%2Finclude%2Flnet%2Flnet.h;h=6b86a22e11a4e532c27e24fcf3564b68d27665d6;hb=e50fc41ad6383e31b896a9306307f10ced1b3de2;hp=819c5241f7c926870dba28e137de36cb7efdb279;hpb=ed88907a96ba81d3558e71ade9def98bdc785169;p=fs%2Flustre-release.git

diff --git a/lnet/include/lnet/lnet.h b/lnet/include/lnet/lnet.h
index 819c524..6b86a22 100644
--- a/lnet/include/lnet/lnet.h
+++ b/lnet/include/lnet/lnet.h
@@ -1,6 +1,37 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
+/*
+ * GPL HEADER START
+ *
+ * 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) 2003, 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.
+ */
+
 #ifndef __LNET_H__
 #define __LNET_H__
 
@@ -9,17 +40,10 @@
  *
  * User application interface file
  */
-#if defined(__linux__)
 #include <lnet/linux/lnet.h>
-#elif defined(__APPLE__)
-#include <lnet/darwin/lnet.h>
-#elif defined(__WINNT__)
-#include <lnet/winnt/lnet.h>
-#else
-#error Unsupported Operating System
-#endif
 
 #include <lnet/types.h>
 #include <lnet/api.h>
+#include <lnet/nidstr.h>
 
 #endif