X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libcfs%2Finclude%2Flibcfs%2Fwinnt%2Fwinnt-types.h;h=b8da381cc38fe954fe027253ccecf28aabc6f795;hb=2841be335687840cf98961e6c6cde6ee9312e4d7;hp=95660e1550cf7878202a13c9fa3a5447ce06dee4;hpb=c8616363809a73b3d4b6c736e6b55a84d7f137b4;p=fs%2Flustre-release.git

diff --git a/libcfs/include/libcfs/winnt/winnt-types.h b/libcfs/include/libcfs/winnt/winnt-types.h
index 95660e1..b8da381 100644
--- a/libcfs/include/libcfs/winnt/winnt-types.h
+++ b/libcfs/include/libcfs/winnt/winnt-types.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.
  */
 /*
@@ -130,13 +128,13 @@ typedef     __u32       suseconds_t;
 typedef     __u16       uid_t, gid_t;
 
 typedef     __u16       mode_t;
-typedef     __u16       umode_t;
+typedef     __u16       cfs_umode_t;
 
 typedef     __u32       sigset_t;
 
 typedef int64_t         loff_t;
 typedef void *          cfs_handle_t;
-typedef uint64_t        cycles_t;
+typedef uint64_t        cfs_cycles_t;
 
 #ifndef INVALID_HANDLE_VALUE
 #define INVALID_HANDLE_VALUE ((HANDLE)-1)
@@ -156,8 +154,6 @@ typedef unsigned long ulong_ptr_t;
 
 typedef __u32           off_t;
 
-typedef unsigned short  kdev_t;
-
 typedef __u32           pid_t;
 typedef __u32           tid_t;