Fix sanity and build

reviewable/pr15980/r3
ncteisen 7 years ago
parent 1e6c0b46bc
commit 5fd07bd9ef
  1. 1
      grpc.def
  2. 1
      src/core/lib/gprpp/inlined_vector.h
  3. 2
      src/ruby/ext/grpc/rb_grpc_imports.generated.c
  4. 3
      src/ruby/ext/grpc/rb_grpc_imports.generated.h
  5. 1
      test/core/surface/public_headers_must_be_c89.c

@ -199,7 +199,6 @@ EXPORTS
gpr_format_message
gpr_strdup
gpr_asprintf
gpr_format_timespec
gpr_mu_init
gpr_mu_destroy
gpr_mu_lock

@ -22,6 +22,7 @@
#include <grpc/support/port_platform.h>
#include <cassert>
#include <cstring>
#include "src/core/lib/gprpp/memory.h"

@ -222,7 +222,6 @@ gpr_cpu_current_cpu_type gpr_cpu_current_cpu_import;
gpr_format_message_type gpr_format_message_import;
gpr_strdup_type gpr_strdup_import;
gpr_asprintf_type gpr_asprintf_import;
gpr_format_timespec_type gpr_format_timespec_import;
gpr_mu_init_type gpr_mu_init_import;
gpr_mu_destroy_type gpr_mu_destroy_import;
gpr_mu_lock_type gpr_mu_lock_import;
@ -471,7 +470,6 @@ void grpc_rb_load_imports(HMODULE library) {
gpr_format_message_import = (gpr_format_message_type) GetProcAddress(library, "gpr_format_message");
gpr_strdup_import = (gpr_strdup_type) GetProcAddress(library, "gpr_strdup");
gpr_asprintf_import = (gpr_asprintf_type) GetProcAddress(library, "gpr_asprintf");
gpr_format_timespec_import = (gpr_format_timespec_type) GetProcAddress(library, "gpr_format_timespec");
gpr_mu_init_import = (gpr_mu_init_type) GetProcAddress(library, "gpr_mu_init");
gpr_mu_destroy_import = (gpr_mu_destroy_type) GetProcAddress(library, "gpr_mu_destroy");
gpr_mu_lock_import = (gpr_mu_lock_type) GetProcAddress(library, "gpr_mu_lock");

@ -641,9 +641,6 @@ extern gpr_strdup_type gpr_strdup_import;
typedef int(*gpr_asprintf_type)(char** strp, const char* format, ...) GPR_PRINT_FORMAT_CHECK(2, 3);
extern gpr_asprintf_type gpr_asprintf_import;
#define gpr_asprintf gpr_asprintf_import
typedef char*(*gpr_format_timespec_type)(gpr_timespec);
extern gpr_format_timespec_type gpr_format_timespec_import;
#define gpr_format_timespec gpr_format_timespec_import
typedef void(*gpr_mu_init_type)(gpr_mu* mu);
extern gpr_mu_init_type gpr_mu_init_import;
#define gpr_mu_init gpr_mu_init_import

@ -257,7 +257,6 @@ int main(int argc, char **argv) {
printf("%lx", (unsigned long) gpr_cpu_current_cpu);
printf("%lx", (unsigned long) gpr_strdup);
printf("%lx", (unsigned long) gpr_asprintf);
printf("%lx", (unsigned long) gpr_format_timespec);
printf("%lx", (unsigned long) gpr_mu_init);
printf("%lx", (unsigned long) gpr_mu_destroy);
printf("%lx", (unsigned long) gpr_mu_lock);

Loading…
Cancel
Save