Commit d27a718c authored by Greg Williams's avatar Greg Williams
Browse files

Merge branch 'develop' of github.com:atomicobject/kinetic-c into develop

parents 923827e9 16ccf8b6

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ $(KINETIC_LIB): $(LIB_OBJS) 
UTIL_OBJS = $(OUT_DIR)/noop.o $(OUT_DIR)/put.o $(OUT_DIR)/get.o

UTIL_INCS = -I/usr/local/include -I$(UTIL_DIR)

# TODO: Delete LIB_DIR dep after kinetic_proto is yanked out of public API

LDFLAGS += -lm -l crypto -l ssl -l kinetic-c-client 

LDFLAGS += -lm -l kinetic-c-client -l crypto -l ssl



$(OUT_DIR)/noop.o: $(UTIL_EX)/noop.c

	$(CC) -c -o $@ $< $(CFLAGS) $(UTIL_INCS)

src/lib/kinetic_message.c

+3 −3
Original line number Diff line number Diff line
@@ -34,9 +34,9 @@ void KineticMessage_Init(KineticMessage* const message) 
    } \

}



// #define CONFIG_OPTIONAL_FIELD_ENUM(name, field, message) { \

//     message->keyValue.(name) = ((int)metadata->algorithm > 0); \

//     if (message->keyValue.has_(name)) { \

// #define CONFIG_OPTIONAL_FIELD_ENUM(name, field, message) { 

//     message->keyValue.(name) = ((int)metadata->algorithm > 0); 

//     if (message->keyValue.has_(name)) { 

//         message->keyValue.algorithm = algorithm; } }



void KineticMessage_ConfigureKeyValue(KineticMessage* const message,