From: John Wolfe <jwolfe@vmware.com>
Date: Tue, 18 Aug 2020 14:14:12 +0000 (-0700)
Subject: Remove the guestApp.h header file that is not needed in conf.h
X-Git-Tag: stable-11.2.0~61
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd54c97c7aca69dda041e82fd1a62a836c20db4f;p=thirdparty%2Fopen-vm-tools.git

Remove the guestApp.h header file that is not needed in conf.h

The configuration header file conf.h includes the guestapp header file
guestApp.h, but there are no related references to the guestapp header
file.  This change removes the unnecessary header file.
The guestApp.h header file is included in the few source files with
a dependency on it.
---

diff --git a/open-vm-tools/lib/include/conf.h b/open-vm-tools/lib/include/conf.h
index 202c4bbdb..5137203cd 100644
--- a/open-vm-tools/lib/include/conf.h
+++ b/open-vm-tools/lib/include/conf.h
@@ -27,8 +27,6 @@
 #ifndef __CONF_H__
 #define __CONF_H__
 
-#include "guestApp.h"
-
 #define CONF_FILE         "tools.conf"
 
 #if ! defined(_WIN32)
diff --git a/open-vm-tools/services/plugins/guestInfo/guestInfoServer.c b/open-vm-tools/services/plugins/guestInfo/guestInfoServer.c
index 5c343e66c..da0b95e68 100644
--- a/open-vm-tools/services/plugins/guestInfo/guestInfoServer.c
+++ b/open-vm-tools/services/plugins/guestInfo/guestInfoServer.c
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 1998-2019 VMware, Inc. All rights reserved.
+ * Copyright (C) 1998-2020 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
@@ -40,6 +40,7 @@
 #include "vmware.h"
 #include "buildNumber.h"
 #include "conf.h"
+#include "guestApp.h"
 #include "debug.h"
 #include "dynxdr.h"
 #include "hostinfo.h"
diff --git a/open-vm-tools/services/plugins/powerOps/powerOps.c b/open-vm-tools/services/plugins/powerOps/powerOps.c
index 04d410797..0dccc8584 100644
--- a/open-vm-tools/services/plugins/powerOps/powerOps.c
+++ b/open-vm-tools/services/plugins/powerOps/powerOps.c
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2008-2016,2018-2019 VMware, Inc. All rights reserved.
+ * Copyright (C) 2008-2016,2018-2020 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
@@ -28,6 +28,7 @@
 #include "vm_basic_defs.h"
 
 #include "conf.h"
+#include "guestApp.h"
 #include "procMgr.h"
 #include "system.h"
 #include "vmware/guestrpc/powerops.h"
diff --git a/open-vm-tools/services/plugins/serviceDiscovery/serviceDiscovery.c b/open-vm-tools/services/plugins/serviceDiscovery/serviceDiscovery.c
index 19fb07438..de8901741 100644
--- a/open-vm-tools/services/plugins/serviceDiscovery/serviceDiscovery.c
+++ b/open-vm-tools/services/plugins/serviceDiscovery/serviceDiscovery.c
@@ -28,6 +28,7 @@
 #include "serviceDiscoveryInt.h"
 #include "vmware.h"
 #include "conf.h"
+#include "guestApp.h"
 #include "dynbuf.h"
 #include "util.h"
 #include "vmcheck.h"
diff --git a/open-vm-tools/services/vmtoolsd/toolsRpc.c b/open-vm-tools/services/vmtoolsd/toolsRpc.c
index 53133731c..9ed6d47bf 100644
--- a/open-vm-tools/services/vmtoolsd/toolsRpc.c
+++ b/open-vm-tools/services/vmtoolsd/toolsRpc.c
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2008-2019 VMware, Inc. All rights reserved.
+ * Copyright (C) 2008-2020 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
@@ -33,6 +33,7 @@
 #include "vm_basic_defs.h"
 #include "vm_assert.h"
 #include "conf.h"
+#include "guestApp.h"
 #include "str.h"
 #include "strutil.h"
 #include "toolsCoreInt.h"