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

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

parents e3e11f3f 32d27a0b

include/kinetic/kinetic.h

+5 −5
Original line number Diff line number Diff line
@@ -21,10 +21,10 @@ 
#ifndef KINETIC_H_

#define KINETIC_H_



#include "../../src/lib/kinetic_types.h"

#include "../../src/lib/kinetic_api.h"

#include "../../src/lib/kinetic_proto.h"

#include "../../src/lib/kinetic_connection.h"

#include <protobuf-c/protobuf-c.h>

#include "kinetic_types.h"

#include "kinetic_api.h"

#include "kinetic_proto.h"

#include "kinetic_connection.h"

#include "protobuf-c.h"



#endif /* KINETIC_H_ */

project.yml

+2 −2
Original line number Diff line number Diff line
@@ -33,11 +33,11 @@ 
  :include:

    - include/**

    - vendor/socket99/

    - vendor/protobuf-c/

    - vendor/protobuf-c/protobuf-c/

  # Refactor release build once the Kinetic-C library is built, and link to it sepearately

  :release_toolchain_include:

    - include/**

    - vendor/protobuf-c/

    - vendor/protobuf-c/protobuf-c/

    - vendor/socket99/



:defines:

src/lib/kinetic_proto.h

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#ifndef _KINETIC_PROTO_H

#define _KINETIC_PROTO_H



#include <protobuf-c/protobuf-c.h>

#include "protobuf-c.h"



PROTOBUF_C__BEGIN_DECLS

src/lib/kinetic_socket.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 


#include "kinetic_socket.h"

#include "kinetic_logger.h"

#include "protobuf-c/protobuf-c.h"

#include "protobuf-c.h"

#include "socket99.h"



#include <errno.h>

test/integration/test_kinetic_api_integration.c

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#include "unity.h"

#include "unity_helper.h"

#include <stdio.h>

#include <protobuf-c/protobuf-c.h>

#include "protobuf-c.h"

#include "kinetic_proto.h"

#include "kinetic_message.h"

#include "kinetic_exchange.h"