Changes to common header files not directly applicable to open-vm-tools.

diff --git a/open-vm-tools/modules/shared/vmmemctl/kernelStubs.h b/open-vm-tools/modules/shared/vmmemctl/kernelStubs.h
index 9309c96870a15f28e111674ffdf28840c478d6de..5fff105f62aeb28e7f9f07e3a0b149508671af91 100644 (file)
--- a/open-vm-tools/modules/shared/vmmemctl/kernelStubs.h
+++ b/open-vm-tools/modules/shared/vmmemctl/kernelStubs.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2006-2017 VMware, Inc. All rights reserved.
+ * Copyright (C) 2006-2018 VMware, Inc. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published
@@ -99,9 +99,13 @@
 #      include "vm_basic_defs.h"
 #      include "vm_assert.h"
 #   elif KRNL_STUBS_DRIVER_TYPE == KRNL_STUBS_DRIVER_TYPE_NDIS
-#      include "vm_basic_types.h"
 #      include <ntddk.h>
+#      include <stdio.h>    /* for _vsnprintf, vsprintf */
+#      include <stdarg.h>   /* for va_start stuff */
+#      include "vm_basic_defs.h"
+#      include "vm_assert.h"
 #      include "kernelStubsFloorFixes.h"
+#pragma warning(disable:4201) // unnamed struct/union
 #      include <ndis.h>
 #   elif KRNL_STUBS_DRIVER_TYPE == KRNL_STUBS_DRIVER_TYPE_WDM
 #      include "vm_basic_types.h"
@@ -278,7 +282,8 @@ char *Str_Asprintf(
 
 // For now (vsphere-2015), we don't implement Panic, Warning, or Debug in the
 // GDI case.
-#if KRNL_STUBS_DRIVER_TYPE != KRNL_STUBS_DRIVER_TYPE_GDI
+#if (KRNL_STUBS_DRIVER_TYPE != KRNL_STUBS_DRIVER_TYPE_GDI) &&\
+    (KRNL_STUBS_DRIVER_TYPE != KRNL_STUBS_DRIVER_TYPE_NDIS)
 
 /*
  * Stub functions we provide.

diff --git a/open-vm-tools/modules/solaris/vmhgfs/kernelStubs.h b/open-vm-tools/modules/solaris/vmhgfs/kernelStubs.h
index 4d458514547056eec1227f9129c26904dde0919a..861e92b1642ed3e89baec0a32f8abe0f431a6609 100644 (file)
--- a/open-vm-tools/modules/solaris/vmhgfs/kernelStubs.h
+++ b/open-vm-tools/modules/solaris/vmhgfs/kernelStubs.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2006-2017 VMware, Inc. All rights reserved.
+ * Copyright (C) 2006-2018 VMware, Inc. All rights reserved.
  *
  * The contents of this file are subject to the terms of the Common
  * Development and Distribution License (the "License") version 1.0
@@ -58,9 +58,13 @@
 #      include "vm_basic_defs.h"
 #      include "vm_assert.h"
 #   elif KRNL_STUBS_DRIVER_TYPE == KRNL_STUBS_DRIVER_TYPE_NDIS
-#      include "vm_basic_types.h"
 #      include <ntddk.h>
+#      include <stdio.h>    /* for _vsnprintf, vsprintf */
+#      include <stdarg.h>   /* for va_start stuff */
+#      include "vm_basic_defs.h"
+#      include "vm_assert.h"
 #      include "kernelStubsFloorFixes.h"
+#pragma warning(disable:4201) // unnamed struct/union
 #      include <ndis.h>
 #   elif KRNL_STUBS_DRIVER_TYPE == KRNL_STUBS_DRIVER_TYPE_WDM
 #      include "vm_basic_types.h"
@@ -237,7 +241,8 @@ char *Str_Asprintf(
 
 // For now (vsphere-2015), we don't implement Panic, Warning, or Debug in the
 // GDI case.
-#if KRNL_STUBS_DRIVER_TYPE != KRNL_STUBS_DRIVER_TYPE_GDI
+#if (KRNL_STUBS_DRIVER_TYPE != KRNL_STUBS_DRIVER_TYPE_GDI) &&\
+    (KRNL_STUBS_DRIVER_TYPE != KRNL_STUBS_DRIVER_TYPE_NDIS)
 
 /*
  * Stub functions we provide.