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

diff --git a/open-vm-tools/lib/include/asyncsocket.h b/open-vm-tools/lib/include/asyncsocket.h
index f5cf148eb3a973e7e689d58cd853cc2977656fd6..524147ea9ca259b9f77de9b444f2a9cf1d7c2c22 100644 (file)
--- a/open-vm-tools/lib/include/asyncsocket.h
+++ b/open-vm-tools/lib/include/asyncsocket.h
@@ -457,18 +457,6 @@ AsyncSocket *AsyncSocket_ListenWebSocketEx(const char *addrStr,
                                            AsyncWebSocketHandleUpgradeRequestFn handleUpgradeRequestFn,
                                            int *outError);
 
-/*
- * Listen on port and fire callback with new asock
- * NOTE - Do not use this API.
- * Listens on 127.0.0.1:port and does not use SSL.
- * This API will be deprecated soon.
- */
-AsyncSocket *AsyncSocket_ListenWebSocketNoHttp(unsigned int port,
-                                             const char *protocols[],
-                                             AsyncSocketConnectFn connectFn,
-                                             void *clientData,
-                                             AsyncSocketPollParams *pollParams,
-                                             int *outError);
 #ifndef _WIN32
 AsyncSocket *AsyncSocket_ListenWebSocketUDS(const char *pipeName,
                                             Bool useSSL,

diff --git a/open-vm-tools/lib/include/uuid.h b/open-vm-tools/lib/include/uuid.h
index 2cb8e9f4bb2ca147dd9fe971d8d077aa2245921d..79342499439ccf77e111f0fe4fde86e0bf4c8f30 100644 (file)
--- a/open-vm-tools/lib/include/uuid.h
+++ b/open-vm-tools/lib/include/uuid.h
@@ -142,6 +142,8 @@ struct {
 #include "vmware_pack_end.h"
 EFIGUID;
 
+Bool UUID_ConvertPackedToBin(EFIGUID *destID,
+                             const char *text);
 
 Bool UUID_ConvertToBin(uint8 dest_id[UUID_SIZE],
                        const char *text);

diff --git a/open-vm-tools/lib/include/vm_product_versions.h b/open-vm-tools/lib/include/vm_product_versions.h
index 447f9cc1f9e77cc7ecde6f217c088afec4b0d8f0..b3a13fb6a2f7f6ec24caed7ccc8574736a4d1c2c 100644 (file)
--- a/open-vm-tools/lib/include/vm_product_versions.h
+++ b/open-vm-tools/lib/include/vm_product_versions.h
@@ -39,7 +39,7 @@
 #if defined(VMX86_VIEWCLIENT)
    #define PRODUCT_VERSION    4,6,0,PRODUCT_BUILD_NUMBER_NUMERIC
 #elif defined(VMX86_VMRC) /* check VMX86_VMRC before VMX86_DESKTOP */
-   #define PRODUCT_VERSION    10,0,1,PRODUCT_BUILD_NUMBER_NUMERIC   /* VMRC_VERSION_NUMBER below has to match this */
+   #define PRODUCT_VERSION    10,0,2,PRODUCT_BUILD_NUMBER_NUMERIC   /* VMRC_VERSION_NUMBER below has to match this */
 #elif defined(VMX86_FLEX) /* check VMX86_FLEX before VMX86_DESKTOP */
    #define PRODUCT_VERSION    8,0,0,PRODUCT_BUILD_NUMBER_NUMERIC   /* FLEX_VERSION_NUMBER below has to match this */
 #elif defined(VMX86_TOOLS)
@@ -157,8 +157,8 @@
 #define WORKSTATION_VERSION "e.x.p"
 #define PLAYER_VERSION_NUMBER "14.0.0" /* this version number should always match real Player version number */
 #define PLAYER_VERSION "e.x.p"
-#define VMRC_VERSION_NUMBER "10.0.1" /* this version number should always match real VMRC version number */
-#define VMRC_VERSION "10.0.1"
+#define VMRC_VERSION_NUMBER "10.0.2" /* this version number should always match real VMRC version number */
+#define VMRC_VERSION "10.0.2"
 #define FLEX_CLIENT_VERSION_NUMBER "8.0.0"
 #define FLEX_CLIENT_VERSION "e.x.p"