From d81e616deb3b85f294925755852541ed7814a080 Mon Sep 17 00:00:00 2001
From: Stefan Berger <stefanb@linux.vnet.ibm.com>
Date: Wed, 11 Jul 2018 00:35:08 -0400
Subject: [PATCH] rev148: Follow changes to CompilerDependencies.h

Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
---
 src/tpm2/CompilerDependencies.h | 41 +++++++++++++++++++++++----------
 1 file changed, 29 insertions(+), 12 deletions(-)

diff --git a/src/tpm2/CompilerDependencies.h b/src/tpm2/CompilerDependencies.h
index 3947676..29bf771 100644
--- a/src/tpm2/CompilerDependencies.h
+++ b/src/tpm2/CompilerDependencies.h
@@ -1,9 +1,9 @@
 /********************************************************************************/
 /*										*/
-/*			     				*/
+/*			   Compiler Dependencies  				*/
 /*			     Written by Ken Goldman				*/
 /*		       IBM Thomas J. Watson Research Center			*/
-/*            $Id: CompilerDependencies.h 1047 2017-07-20 18:27:34Z kgoldman $	*/
+/*            $Id: CompilerDependencies.h 1259 2018-07-10 19:11:09Z kgoldman $	*/
 /*										*/
 /*  Licenses and Notices							*/
 /*										*/
@@ -55,7 +55,7 @@
 /*    arising in any way out of use or reliance upon this specification or any 	*/
 /*    information herein.							*/
 /*										*/
-/*  (c) Copyright IBM Corp. and others, 2016, 2017				*/
+/*  (c) Copyright IBM Corp. and others, 2016 - 2018				*/
 /*										*/
 /********************************************************************************/
 
@@ -124,7 +124,9 @@
 #endif 	// _MSC_VER
 
 #ifndef _MSC_VER
+#ifndef WINAPI
 #   define WINAPI
+#endif
 #   define __pragma(x)
 #   if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR >= 2)
 #     define REVERSE_ENDIAN_16(_Number) __builtin_bswap16(_Number)
@@ -152,22 +154,37 @@
 #   endif
 #   ifdef INLINE_FUNCTIONS
 #      define INLINE static inline
-#   endif
-#   if defined(__GNUC__)
+#   endif	// INLINE_FUNCTIONS
+#endif
+#if defined(__GNUC__)
 #      define NORETURN                     __attribute__((noreturn))
 #      include <stdint.h>
-#   else
-#      define NORETURN
-#   endif
+#endif
+
+// Things that are not defined should be defined as NULL
+#ifndef NORETURN
+#   define NORETURN
+#endif
+#ifndef LIB_EXPORT
 #   define LIB_EXPORT
+#endif
+#ifndef LIB_IMPORT
 #   define LIB_IMPORT
+#endif
+#ifndef _REDUCE_WARNING_LEVEL_
 #   define _REDUCE_WARNING_LEVEL_(n)
+#endif
+#ifndef _NORMAL_WARNING_LEVEL_
 #   define _NORMAL_WARNING_LEVEL_
+#endif
+#ifndef NOT_REFERENCED
 #   define  NOT_REFERENCED(x) (x = x)
-#endif	// _MSC_VER
-
-#ifdef TPM_POSIX
+#endif
+#ifdef _POSIX_
 typedef int SOCKET;
 #endif
+// #ifdef TPM_POSIX
+// typedef int SOCKET;
+// #endif
+#endif // _COMPILER_DEPENDENCIES_H_
 
-#endif 	// COMPILERDEPEDENCIES_H
-- 
2.39.5