Header file guestcust-events.h moved to a new location.

diff --git a/open-vm-tools/lib/include/imgcust-guest/guestcust-events.h b/open-vm-tools/lib/include/vmware/guestrpc/guestcust-events.h
similarity index 69%
rename from open-vm-tools/lib/include/imgcust-guest/guestcust-events.h
rename to open-vm-tools/lib/include/vmware/guestrpc/guestcust-events.h
index 4cbd36bf00c7e838dfc7bd79456d7d05bc4b6991..82ac09889e9a5bc034f747aec6def944f9e90183 100644 (file)
--- a/open-vm-tools/lib/include/imgcust-guest/guestcust-events.h
+++ b/open-vm-tools/lib/include/vmware/guestrpc/guestcust-events.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2005-2016 VMware, Inc. All rights reserved.
+ * Copyright (C) 2008 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
@@ -16,20 +16,20 @@
  *
  *********************************************************/
 
-/*
- * guestcust-events.h --
- *
- *      Definitions related to the GOSC events.
+/*!
+ * @file guestcust-events.h --
  */
 
-#ifndef IMGCUST_COMMON_GOSC_EVENTS_H
-#define IMGCUST_COMMON_GOSC_EVENTS_H
+#ifndef _GUESTCUST_EVENTS_H
+#define _GUESTCUST_EVENTS_H
 
 /*
  * Customization-specific events generated in the guest and handled by
- * hostd. They are sent via the vmx/guestTools/deployPkgState/ vmdb path.
- * We start these at 100 to avoid conflict with the deployPkg error
- * codes listed in vmx/public/toolsDeployPkg.h.
+ * hostd. They are sent via the Tools/deployPkgState/error VIGOR path.
+ * The error(int) field is overloaded for both the deploy pkg errors
+ * and the deploy pkg events.
+ * Therefore, We start these at 100 to avoid conflict with the deployPkg error
+ * codes listed in bora/guestABI/include/vmware/guestrpc/deploypkg.h
  */
 typedef enum {
    GUESTCUST_EVENT_CUSTOMIZE_FAILED = 100,
@@ -39,4 +39,4 @@ typedef enum {
    GUESTCUST_EVENT_QUERY_NICS
 } GuestCustEvent;
 
-#endif // IMGCUST_COMMON_GOSC_EVENTS_H
+#endif // _GUESTCUST_EVENTS_H

diff --git a/open-vm-tools/libDeployPkg/Makefile.am b/open-vm-tools/libDeployPkg/Makefile.am
index b4d5c9d0c50c0a4274503c44d5c00410653cc3e8..87428a1b28640ba9e2e52e00b4befdc2430317a9 100644 (file)
--- a/open-vm-tools/libDeployPkg/Makefile.am
+++ b/open-vm-tools/libDeployPkg/Makefile.am
@@ -48,11 +48,11 @@ libDeployPkg_include_HEADERS += $(top_srcdir)/lib/include/includeCheck.h
 libDeployPkg_include_HEADERS += $(top_srcdir)/lib/include/imgcust-common/imgcust-api.h
 libDeployPkg_include_HEADERS += $(top_srcdir)/lib/include/imgcust-common/log.h
 libDeployPkg_include_HEADERS += $(top_srcdir)/lib/include/imgcust-common/process.h
-libDeployPkg_include_HEADERS += $(top_srcdir)/lib/include/imgcust-guest/guestcust-events.h
 libDeployPkg_include_HEADERS += $(top_srcdir)/lib/include/vm_basic_types.h
 libDeployPkg_include_HEADERS += $(top_srcdir)/lib/include/vmware/tools/guestrpc.h
 libDeployPkg_include_HEADERS += $(top_srcdir)/lib/include/deployPkg/linuxDeployment.h
 libDeployPkg_include_HEADERS += $(top_srcdir)/lib/include/vmware/guestrpc/deploypkg.h
+libDeployPkg_include_HEADERS += $(top_srcdir)/lib/include/vmware/guestrpc/guestcust-events.h
 
 EXTRA_DIST = libDeployPkg.pc.in