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 202c4bbdb4693ceb33ba1706d9ad38d5c7beb4a9..5137203cd39fb6d3d82c8e7859aa09d9580761cc 100644 (file)
--- 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 5c343e66cc005cacb46f2c9f4e5d2101b370ae19..da0b95e68bc2f5aad3ff9f205a0be554aed968cf 100644 (file)
--- 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 04d4107979d61363b8ae720eb5e4fcd039a6b392..0dccc8584b4bcc4d09caa7564d17da17bcbb3f33 100644 (file)
--- 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 19fb07438ed7c3a2c547c5a8441f7cb3f7a655ca..de890174148049d624b50d1dfba9e3466e85077c 100644 (file)
--- 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 53133731c10ce1947201862e44e22b8cb8dca986..9ed6d47bfad0321f06b06445cdb81b3b2085cde7 100644 (file)
--- 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"