From: John Wolfe <jwolfe@vmware.com>
Date: Fri, 11 Sep 2020 19:11:04 +0000 (-0700)
Subject: Get rid of more vmware_pack files.
X-Git-Tag: stable-11.2.0~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe7c6ebcd1fdf3e25246c7e1725063f8c4978db3;p=thirdparty%2Fopen-vm-tools.git

Get rid of more vmware_pack files.

gcc supports the Microsoft-style "pragma pack" syntax.
Standardize on it.  The conversion is somewhat non-trivial,
as gcc requires "pragma" to be before or after a statement,
not in the middle.
---

diff --git a/open-vm-tools/lib/hashMap/hashMap.c b/open-vm-tools/lib/hashMap/hashMap.c
index 59560407d..94b0e10fd 100644
--- a/open-vm-tools/lib/hashMap/hashMap.c
+++ b/open-vm-tools/lib/hashMap/hashMap.c
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2009-2018 VMware, Inc. All rights reserved.
+ * Copyright (C) 2009-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
@@ -104,9 +104,8 @@ struct HashMap {
 };
 
 #ifdef VMX86_SERVER
-typedef
-#include "vmware_pack_begin.h"
-struct HashMapOnDisk {
+#pragma pack(push, 1)
+typedef struct HashMapOnDisk {
    uint32 numEntries;
    uint32 count;
    uint32 alpha;
@@ -117,9 +116,8 @@ struct HashMapOnDisk {
 
    uint64 keyOffset;
    uint64 dataOffset;
-}
-#include "vmware_pack_end.h"
-HashMapOnDisk;
+} HashMapOnDisk;
+#pragma pack(pop)
 #endif
 
 typedef enum {