From: John Wolfe Date: Mon, 22 Feb 2021 17:36:59 +0000 (-0800) Subject: Remove lib/include/vmware_pack_*.h header files. X-Git-Tag: stable-11.3.0~152 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd2c979437f44ecdc5a23a24b3e0afd301a21151;p=thirdparty%2Fopen-vm-tools.git Remove lib/include/vmware_pack_*.h header files. Previous changes have removed the last usages of these headers; now using '#pragma pack' 100% of the time. --- diff --git a/open-vm-tools/lib/include/vmware_pack_begin.h b/open-vm-tools/lib/include/vmware_pack_begin.h deleted file mode 100644 index d08d1dce2..000000000 --- a/open-vm-tools/lib/include/vmware_pack_begin.h +++ /dev/null @@ -1,57 +0,0 @@ -/********************************************************* - * Copyright (C) 2002-2016 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 - * by the Free Software Foundation version 2.1 and no later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the Lesser GNU General Public - * License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - *********************************************************/ - -/********************************************************* - * The contents of this file are subject to the terms of the Common - * Development and Distribution License (the "License") version 1.0 - * and no later version. You may not use this file except in - * compliance with the License. - * - * You can obtain a copy of the License at - * http://www.opensource.org/licenses/cddl1.php - * - * See the License for the specific language governing permissions - * and limitations under the License. - * - *********************************************************/ - -/* - * vmware_pack_begin.h -- - * - * Begin of structure packing. See vmware_pack_init.h for details. - * - * Note that we do not use the following construct in this include file, - * because we want to emit the code every time the file is included --hpreg - * - * #ifndef foo - * # define foo - * ... - * #endif - * - */ - - -#include "vmware_pack_init.h" - - -#ifdef _MSC_VER -# pragma pack(push, 1) -#elif __GNUC__ -#else -# error Compiler packing... -#endif diff --git a/open-vm-tools/lib/include/vmware_pack_end.h b/open-vm-tools/lib/include/vmware_pack_end.h deleted file mode 100644 index 8da74d01b..000000000 --- a/open-vm-tools/lib/include/vmware_pack_end.h +++ /dev/null @@ -1,58 +0,0 @@ -/********************************************************* - * Copyright (C) 2002-2016 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 - * by the Free Software Foundation version 2.1 and no later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the Lesser GNU General Public - * License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - *********************************************************/ - -/********************************************************* - * The contents of this file are subject to the terms of the Common - * Development and Distribution License (the "License") version 1.0 - * and no later version. You may not use this file except in - * compliance with the License. - * - * You can obtain a copy of the License at - * http://www.opensource.org/licenses/cddl1.php - * - * See the License for the specific language governing permissions - * and limitations under the License. - * - *********************************************************/ - -/* - * vmware_pack_end.h -- - * - * End of structure packing. See vmware_pack_init.h for details. - * - * Note that we do not use the following construct in this include file, - * because we want to emit the code every time the file is included --hpreg - * - * #ifndef foo - * # define foo - * ... - * #endif - * - */ - - -#include "vmware_pack_init.h" - - -#ifdef _MSC_VER -# pragma pack(pop) -#elif __GNUC__ -__attribute__((__packed__)) -#else -# error Compiler packing... -#endif diff --git a/open-vm-tools/lib/include/vmware_pack_init.h b/open-vm-tools/lib/include/vmware_pack_init.h deleted file mode 100644 index 2fdfe9e61..000000000 --- a/open-vm-tools/lib/include/vmware_pack_init.h +++ /dev/null @@ -1,79 +0,0 @@ -/********************************************************* - * Copyright (C) 2002-2016 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 - * by the Free Software Foundation version 2.1 and no later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the Lesser GNU General Public - * License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - *********************************************************/ - -/********************************************************* - * The contents of this file are subject to the terms of the Common - * Development and Distribution License (the "License") version 1.0 - * and no later version. You may not use this file except in - * compliance with the License. - * - * You can obtain a copy of the License at - * http://www.opensource.org/licenses/cddl1.php - * - * See the License for the specific language governing permissions - * and limitations under the License. - * - *********************************************************/ - -#ifndef __VMWARE_PACK_INIT_H__ -# define __VMWARE_PACK_INIT_H__ - - -/* - * vmware_pack_init.h -- - * - * Platform-independent code to make the compiler pack (i.e. have them - * occupy the smallest possible space) structure definitions. The following - * constructs are known to work --hpreg - * - * #include "vmware_pack_begin.h" - * struct foo { - * ... - * } - * #include "vmware_pack_end.h" - * ; - * - * typedef - * #include "vmware_pack_begin.h" - * struct foo { - * ... - * } - * #include "vmware_pack_end.h" - * foo; - */ - - -#ifdef _MSC_VER -/* - * MSVC 6.0 emits warning 4103 when the pack push and pop pragma pairing is - * not balanced within 1 included file. That is annoying because our scheme - * is based on the pairing being balanced between 2 included files. - * - * So we disable this warning, but this is safe because the compiler will also - * emit warning 4161 when there is more pops than pushes within 1 main - * file --hpreg - */ - -# pragma warning(disable:4103) -#elif __GNUC__ -#else -# error Compiler packing... -#endif - - -#endif /* __VMWARE_PACK_INIT_H__ */