From: Tianjiao Yin <ytj000@gmail.com>
Date: Mon, 7 Feb 2022 08:48:05 +0000 (-0800)
Subject: Replace macros with typedefs in gssrpc types.h
X-Git-Tag: krb5-1.20-beta1~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=922592d3f57c831a2d539ff9b643953b56e6c515;p=thirdparty%2Fkrb5.git

Replace macros with typedefs in gssrpc types.h

Defining bool_t and enum_t with the preprocessor conflicts with
namespaced declarations in fbthrift's headers.  Use typedefs to avoid
this conflict and for consistency with other Sun RPC implementations.

[ghudson@mit.edu: clarified commit message]

ticket: 9054 (new)
---

diff --git a/src/include/gssrpc/types.hin b/src/include/gssrpc/types.hin
index 4c4120c6f8..25901794e9 100644
--- a/src/include/gssrpc/types.hin
+++ b/src/include/gssrpc/types.hin
@@ -95,8 +95,8 @@ typedef int32_t		rpc_inline_t;
 /* This is for rpc/netdb.h */
 @rpcent_define@
 
-#define	bool_t	int
-#define	enum_t	int
+typedef int bool_t;
+typedef int enum_t;
 #ifndef FALSE
 #	define	FALSE	(0)
 #endif