From: Oliver Kurth <okurth@vmware.com>
Date: Tue, 24 Apr 2018 00:08:18 +0000 (-0700)
Subject: Changes to common header files not directly applicable to open-vm-tools.
X-Git-Tag: stable-10.3.0~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f87d177acab33f00229234ed51722504e2f7afc7;p=thirdparty%2Fopen-vm-tools.git

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 9309c9687..5fff105f6 100644
--- 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 4d4585145..861e92b16 100644
--- 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.