From b51ec5a4bae7e78cf542b682907917975d4740c6 Mon Sep 17 00:00:00 2001
From: "Nicolas \"Pixel\" Noble" <pixel@nobis-crew.org>
Date: Sun, 31 Jan 2016 09:36:09 +0100
Subject: [PATCH] Removing zookeeper's API for now.
---
grpc.def | 1 -
grpc.gemspec | 1 -
include/grpc/grpc_zookeeper.h | 2 +-
src/ruby/ext/grpc/rb_grpc_imports.generated.c | 2 --
src/ruby/ext/grpc/rb_grpc_imports.generated.h | 4 ----
5 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/grpc.def b/grpc.def
index 8b5f9cc8aa..4a1cc75cc9 100644
--- a/grpc.def
+++ b/grpc.def
@@ -118,7 +118,6 @@ EXPORTS
grpc_server_add_secure_http2_port
grpc_call_set_credentials
grpc_server_credentials_set_auth_metadata_processor
- grpc_zookeeper_register
gpr_malloc
gpr_free
gpr_realloc
diff --git a/grpc.gemspec b/grpc.gemspec
index da9694bc8a..b91c4050f5 100755
--- a/grpc.gemspec
+++ b/grpc.gemspec
@@ -18,7 +18,6 @@ Gem::Specification.new do |s|
s.files = %w( Makefile )
s.files += %w( etc/roots.pem )
- s.files += %w( tools/distrib/grpc/docker_for_windows.rb )
s.files += Dir.glob('src/ruby/bin/**/*')
s.files += Dir.glob('src/ruby/ext/**/*')
s.files += Dir.glob('src/ruby/lib/**/*')
diff --git a/include/grpc/grpc_zookeeper.h b/include/grpc/grpc_zookeeper.h
index f6a5246d3a..b23bd88b43 100644
--- a/include/grpc/grpc_zookeeper.h
+++ b/include/grpc/grpc_zookeeper.h
@@ -50,7 +50,7 @@ extern "C" {
#endif
/** Register zookeeper name resolver in grpc */
-GRPC_API void grpc_zookeeper_register();
+void grpc_zookeeper_register();
#ifdef __cplusplus
}
diff --git a/src/ruby/ext/grpc/rb_grpc_imports.generated.c b/src/ruby/ext/grpc/rb_grpc_imports.generated.c
index 4291593077..a278b2ba99 100644
--- a/src/ruby/ext/grpc/rb_grpc_imports.generated.c
+++ b/src/ruby/ext/grpc/rb_grpc_imports.generated.c
@@ -156,7 +156,6 @@ grpc_ssl_server_credentials_create_type grpc_ssl_server_credentials_create_impor
grpc_server_add_secure_http2_port_type grpc_server_add_secure_http2_port_import;
grpc_call_set_credentials_type grpc_call_set_credentials_import;
grpc_server_credentials_set_auth_metadata_processor_type grpc_server_credentials_set_auth_metadata_processor_import;
-grpc_zookeeper_register_type grpc_zookeeper_register_import;
gpr_malloc_type gpr_malloc_import;
gpr_free_type gpr_free_import;
gpr_realloc_type gpr_realloc_import;
@@ -419,7 +418,6 @@ void grpc_rb_load_imports(HMODULE library) {
grpc_server_add_secure_http2_port_import = (grpc_server_add_secure_http2_port_type) GetProcAddress(library, "grpc_server_add_secure_http2_port");
grpc_call_set_credentials_import = (grpc_call_set_credentials_type) GetProcAddress(library, "grpc_call_set_credentials");
grpc_server_credentials_set_auth_metadata_processor_import = (grpc_server_credentials_set_auth_metadata_processor_type) GetProcAddress(library, "grpc_server_credentials_set_auth_metadata_processor");
- grpc_zookeeper_register_import = (grpc_zookeeper_register_type) GetProcAddress(library, "grpc_zookeeper_register");
gpr_malloc_import = (gpr_malloc_type) GetProcAddress(library, "gpr_malloc");
gpr_free_import = (gpr_free_type) GetProcAddress(library, "gpr_free");
gpr_realloc_import = (gpr_realloc_type) GetProcAddress(library, "gpr_realloc");
diff --git a/src/ruby/ext/grpc/rb_grpc_imports.generated.h b/src/ruby/ext/grpc/rb_grpc_imports.generated.h
index fba52efc6d..3e29496a43 100644
--- a/src/ruby/ext/grpc/rb_grpc_imports.generated.h
+++ b/src/ruby/ext/grpc/rb_grpc_imports.generated.h
@@ -44,7 +44,6 @@
#include <grpc/compression.h>
#include <grpc/grpc.h>
#include <grpc/grpc_security.h>
-#include <grpc/grpc_zookeeper.h>
#include <grpc/impl/codegen/alloc.h>
#include <grpc/impl/codegen/byte_buffer.h>
#include <grpc/impl/codegen/log.h>
@@ -419,9 +418,6 @@ extern grpc_call_set_credentials_type grpc_call_set_credentials_import;
typedef void(*grpc_server_credentials_set_auth_metadata_processor_type)(grpc_server_credentials *creds, grpc_auth_metadata_processor processor);
extern grpc_server_credentials_set_auth_metadata_processor_type grpc_server_credentials_set_auth_metadata_processor_import;
#define grpc_server_credentials_set_auth_metadata_processor grpc_server_credentials_set_auth_metadata_processor_import
-typedef void(*grpc_zookeeper_register_type)();
-extern grpc_zookeeper_register_type grpc_zookeeper_register_import;
-#define grpc_zookeeper_register grpc_zookeeper_register_import
typedef void *(*gpr_malloc_type)(size_t size);
extern gpr_malloc_type gpr_malloc_import;
#define gpr_malloc gpr_malloc_import
--
GitLab