Skip to content
Snippets Groups Projects
Commit 99058575 authored by murgatroid99's avatar murgatroid99
Browse files

Remove unnecessary #ifdef in credentials code

parent 085f9afa
Branches
Tags
No related merge requests found
......@@ -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 */
......@@ -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);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment