From 99058575be6f6a0146ea9ebd2cd1a698756bd8d5 Mon Sep 17 00:00:00 2001
From: murgatroid99 <mlumish@google.com>
Date: Tue, 25 Oct 2016 10:51:20 -0700
Subject: [PATCH] Remove unnecessary #ifdef in credentials code
---
.../security/credentials/google_default/credentials_generic.c | 4 ----
.../credentials/google_default/google_default_credentials.h | 2 --
2 files changed, 6 deletions(-)
diff --git a/src/core/lib/security/credentials/google_default/credentials_generic.c b/src/core/lib/security/credentials/google_default/credentials_generic.c
index 013e3b5451..d13d8c5200 100644
--- a/src/core/lib/security/credentials/google_default/credentials_generic.c
+++ b/src/core/lib/security/credentials/google_default/credentials_generic.c
@@ -33,8 +33,6 @@
#include "src/core/lib/security/credentials/google_default/google_default_credentials.h"
-#ifdef GRPC_GOOGLE_CREDENTIALS_GENERIC
-
#include <grpc/support/alloc.h>
#include <grpc/support/log.h>
#include <grpc/support/string_util.h>
@@ -54,5 +52,3 @@ char *grpc_get_well_known_google_credentials_file_path_impl(void) {
gpr_free(base);
return result;
}
-
-#endif /* GRPC_GOOGLE_CREDENTIALS_GENERIC */
diff --git a/src/core/lib/security/credentials/google_default/google_default_credentials.h b/src/core/lib/security/credentials/google_default/google_default_credentials.h
index 0a5a6605e5..b55546ded0 100644
--- a/src/core/lib/security/credentials/google_default/google_default_credentials.h
+++ b/src/core/lib/security/credentials/google_default/google_default_credentials.h
@@ -47,13 +47,11 @@
#define GRPC_GOOGLE_CREDENTIALS_PATH_SUFFIX \
GRPC_GOOGLE_CLOUD_SDK_CONFIG_DIRECTORY \
"/" GRPC_GOOGLE_WELL_KNOWN_CREDENTIALS_FILE
-#define GRPC_GOOGLE_CREDENTIALS_GENERIC 1
#else
#define GRPC_GOOGLE_CREDENTIALS_PATH_ENV_VAR "HOME"
#define GRPC_GOOGLE_CREDENTIALS_PATH_SUFFIX \
".config/" GRPC_GOOGLE_CLOUD_SDK_CONFIG_DIRECTORY \
"/" GRPC_GOOGLE_WELL_KNOWN_CREDENTIALS_FILE
-#define GRPC_GOOGLE_CREDENTIALS_GENERIC 1
#endif
void grpc_flush_cached_google_default_credentials(void);
--
GitLab