From: John Wolfe <jwolfe@vmware.com>
Date: Mon, 22 Feb 2021 17:37:00 +0000 (-0800)
Subject: Common header file changes: additional pre-gcc-4.4 clean up.
X-Git-Tag: stable-11.3.0~133
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=533d1a6ee716635f0175584e62aaa6a1a115e00e;p=thirdparty%2Fopen-vm-tools.git

Common header file changes: additional pre-gcc-4.4 clean up.
---

diff --git a/open-vm-tools/lib/include/fileIO.h b/open-vm-tools/lib/include/fileIO.h
index c8fff334a..03165f93c 100644
--- a/open-vm-tools/lib/include/fileIO.h
+++ b/open-vm-tools/lib/include/fileIO.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 1998-2018 VMware, Inc. All rights reserved.
+ * Copyright (C) 1998-2018,2021 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
@@ -509,21 +509,11 @@ const char *FileIO_Filename(FileIODescriptor *fd);
  *-------------------------------------------------------------------------
  */
 
-#if !defined(sun) || __GNUC__ >= 3
 static INLINE Bool
 FileIO_IsSuccess(FileIOResult res)      // IN
 {
    return res == FILEIO_SUCCESS;
 }
-#else
-/*
- * XXX: Crosscompiler used for Solaris tools builds (gcc 2.95.3) complains
- * whenever the above definition is unused, even though that shouldn't be
- * a problem for static functions that are also inline.  So for Solaris, we
- * have a separate definition that is neither static nor inline.
- */
-Bool FileIO_IsSuccess(FileIOResult res);
-#endif
 
 Bool FileIO_SupportsPrealloc(const char *pathName,
                              Bool fsCheck);
diff --git a/open-vm-tools/lib/include/vm_api.h b/open-vm-tools/lib/include/vm_api.h
index 9a59fef91..cae54b78b 100644
--- a/open-vm-tools/lib/include/vm_api.h
+++ b/open-vm-tools/lib/include/vm_api.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2010-2016 VMware, Inc. All rights reserved.
+ * Copyright (C) 2010-2016,2021 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
@@ -117,7 +117,7 @@
 #  define VMW_LIB_CLIENT_INLINE
 #  define VMW_LIB_DYNAMIC  __declspec(dllexport)
 #  define VMW_LIB_DYNAMIC_INLINE
-#elif defined __GNUC__ && __GNUC__ >= 4 /* !_MSC_VER */
+#elif defined __GNUC__
 #  define VMW_LIB_STATIC  __attribute__ ((visibility ("hidden")))
 #  define VMW_LIB_CLIENT  __attribute__ ((visibility ("default")))
 #  define VMW_LIB_CLIENT_INLINE  __attribute__ ((visibility ("default")))