Commit e3ce451b authored by Josh Haberman's avatar Josh Haberman

Fixed compiler warnings and added -std=c99.

upb no longer requires -std=c99 but the Ruby/C
code still uses C99 features.
parent e8ed021e
...@@ -546,11 +546,9 @@ upb_fieldtype_t ruby_to_fieldtype(VALUE type) { ...@@ -546,11 +546,9 @@ upb_fieldtype_t ruby_to_fieldtype(VALUE type) {
rb_raise(rb_eArgError, "Expected symbol for field type."); rb_raise(rb_eArgError, "Expected symbol for field type.");
} }
upb_fieldtype_t upb_type = -1;
#define CONVERT(upb, ruby) \ #define CONVERT(upb, ruby) \
if (SYM2ID(type) == rb_intern( # ruby )) { \ if (SYM2ID(type) == rb_intern( # ruby )) { \
upb_type = UPB_TYPE_ ## upb; \ return UPB_TYPE_ ## upb; \
} }
CONVERT(FLOAT, float); CONVERT(FLOAT, float);
...@@ -567,11 +565,8 @@ upb_fieldtype_t ruby_to_fieldtype(VALUE type) { ...@@ -567,11 +565,8 @@ upb_fieldtype_t ruby_to_fieldtype(VALUE type) {
#undef CONVERT #undef CONVERT
if (upb_type == -1) { rb_raise(rb_eArgError, "Unknown field type.");
rb_raise(rb_eArgError, "Unknown field type."); return 0;
}
return upb_type;
} }
VALUE fieldtype_to_ruby(upb_fieldtype_t type) { VALUE fieldtype_to_ruby(upb_fieldtype_t type) {
...@@ -666,10 +661,12 @@ VALUE FieldDescriptor_label_set(VALUE _self, VALUE label) { ...@@ -666,10 +661,12 @@ VALUE FieldDescriptor_label_set(VALUE _self, VALUE label) {
} }
upb_label_t upb_label = -1; upb_label_t upb_label = -1;
bool converted = false;
#define CONVERT(upb, ruby) \ #define CONVERT(upb, ruby) \
if (SYM2ID(label) == rb_intern( # ruby )) { \ if (SYM2ID(label) == rb_intern( # ruby )) { \
upb_label = UPB_LABEL_ ## upb; \ upb_label = UPB_LABEL_ ## upb; \
converted = true; \
} }
CONVERT(OPTIONAL, optional); CONVERT(OPTIONAL, optional);
...@@ -678,7 +675,7 @@ VALUE FieldDescriptor_label_set(VALUE _self, VALUE label) { ...@@ -678,7 +675,7 @@ VALUE FieldDescriptor_label_set(VALUE _self, VALUE label) {
#undef CONVERT #undef CONVERT
if (upb_label == -1) { if (!converted) {
rb_raise(rb_eArgError, "Unknown field label."); rb_raise(rb_eArgError, "Unknown field label.");
} }
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
require 'mkmf' require 'mkmf'
$CFLAGS += " -O3 -DNDEBUG" $CFLAGS += " -std=c99 -O3 -DNDEBUG"
$objs = ["protobuf.o", "defs.o", "storage.o", "message.o", $objs = ["protobuf.o", "defs.o", "storage.o", "message.o",
"repeated_field.o", "map.o", "encode_decode.o", "upb.o"] "repeated_field.o", "map.o", "encode_decode.o", "upb.o"]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment