LU-7759 utils: build mount.lustre with libmount

[fs/lustre-release.git] / libcfs / include / libcfs / user-time.h

diff --git a/libcfs/include/libcfs/user-time.h b/libcfs/include/libcfs/user-time.h
index 4f2bc8b..d88af2e 100644 (file)
--- a/libcfs/include/libcfs/user-time.h
+++ b/libcfs/include/libcfs/user-time.h
@@ -1,6 +1,4 @@
-/* -*- 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.
@@ -26,7 +24,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 /*
@@ -43,10 +41,6 @@
 #ifndef __LIBCFS_USER_TIME_H__
 #define __LIBCFS_USER_TIME_H__
 
-#ifndef __LIBCFS_LIBCFS_H__
-#error Do not #include this file directly. #include <libcfs/libcfs.h> instead
-#endif
-
 /* Portable time API */
 
 /*
@@ -88,7 +82,14 @@
 
 #ifndef __KERNEL__
 
-#define ONE_BILLION ((u_int64_t)1000000000)
+#include <stdarg.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <sys/time.h>
+#include <time.h>
+
+#define ONE_BILLION ((uint64_t)1000000000)
 #define ONE_MILLION 1000000
 
 /*