Updated static const usages to fix linux build (7e73f009) · Commits · kinetic-archive / kinetic-c

Makefile

+8 −8

Original line number	Diff line number	Diff line
		OUT_DIR = obj
		BIN_DIR = bin
		OBJS = $(OUT_DIR)/protobuf-c.o $(OUT_DIR)/KineticProto.o $(OUT_DIR)/kinetic-c-client.o
		INCS = -I"./include" -I"./src/main" -I"./src/vendor"
		BIN = $(BIN_DIR)/kinetic-c-client
		OBJS = $(OUT_DIR)/protobuf-c.o $(OUT_DIR)/kinetic_proto.o $(OUT_DIR)/kinetic_client.o
		INCS = -I"./include" -I"./src/lib" -I"./vendor/protobuf=c" -I"./vendor"
		BIN = $(BIN_DIR)/kinetic_client
		CC = gcc
		CFLAGS = $(INCS) -g -Wall
		LFLAGS = -Wall
		@@ -26,14 +26,14 @@ $(BIN_DIR):
		clean:
		$(RM_ALL) $(OBJS) $(OUT_DIR) $(BIN)

		$(OUT_DIR)/protobuf-c.o: directories ./src/vendor/protobuf-c/protobuf-c.h ./src/vendor/protobuf-c/protobuf-c.c
		$(OUT_DIR)/protobuf-c.o: directories ./vendor/protobuf-c/protobuf-c.c
		$(CC) $(CFLAGS) -c ./src/vendor/protobuf-c/protobuf-c.c -o $@

		$(OUT_DIR)/KineticProto.o: directories ./src/main/KineticProto.h ./src/main/KineticProto.c ./src/vendor/protobuf-c/protobuf-c.h ./src/vendor/protobuf-c/protobuf-c.c
		$(CC) $(CFLAGS) -c ./src/main/KineticProto.c -o $@
		$(OUT_DIR)/kinetic_proto.o: directories /src/lib/kinetic_proto.c ./vendor/protobuf-c/protobuf-c.c
		$(CC) $(CFLAGS) -c ./src/lib/kinetic_proto.c -o $@

		$(OUT_DIR)/kinetic-c-client.o: directories ./src/main/main.c ./src/main/KineticProto.h ./src/main/KineticProto.c ./src/vendor/protobuf-c/protobuf-c.h ./src/vendor/protobuf-c/protobuf-c.c
		$(CC) $(CFLAGS) -c ./src/main/main.c -o $@
		$(OUT_DIR)/kinetic_client.o: directories ./src/lib/kinetic_client.c /src/lib/kinetic_proto.c ./vendor/protobuf-c/protobuf-c.c
		$(CC) $(CFLAGS) -c ./src/lib/kinetic_client.c -o $@

		$(BIN): $(OBJS)
		$(CC) $(LFLAGS) $(OBJS) -o $(BIN)

include/kinetic/kinetic.h

deleted100644 → 0

+0 −30

Original line number	Diff line number	Diff line
		/*
		* kinetic-c-client
		* Copyright (C) 2014 Seagate Technology.
		*
		* This program is free software; you can redistribute it and/or
		* modify it under the terms of the GNU General Public License
		* as published by the Free Software Foundation; either version 2
		* of the License, or (at your option) any later version.
		*
		* This program is distributed in the hope that it will be useful,
		* but WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		* GNU General Public License for more details.
		*
		* You should have received a copy of the GNU General Public License
		* along with this program; if not, write to the Free Software
		* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
		*
		*/

		#ifndef KINETIC_H_
		#define KINETIC_H_

		#include "protobuf-c.h"
		#include "kinetic_proto.h"
		#include "kinetic_logger.h"
		#include "kinetic_connection.h"
		#include "kinetic_client.h"

		#endif /* KINETIC_H_ */

src/lib/kinetic_client.h→include/kinetic_client.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -22,8 +22,6 @@
		#define _KINETIC_CLIENT_H

		#include "kinetic_types.h"
		#include "kinetic_pdu.h"
		#include "kinetic_operation.h"

		/**
		* Initializes the Kinetic API andcsonfigures logging destination.

src/lib/kinetic_client.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,8 @@
		*/

		#include "kinetic_client.h"
		#include "kinetic_pdu.h"
		#include "kinetic_operation.h"
		#include "kinetic_connection.h"
		#include "kinetic_message.h"
		#include "kinetic_pdu.h"

test/integration/test_integration_get.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -40,7 +40,7 @@ static KineticOperation Operation;
		static ByteArray RequestHeader;
		static ByteArray ResponseHeaderRaw;
		static ByteArray ResponseProtobuf;
		static const ByteArray HMACKey = BYTE_ARRAY_INIT_FROM_CSTRING("some_hmac_key");
		static ByteArray HMACKey = BYTE_ARRAY_INIT_FROM_CSTRING("some_hmac_key");

		void setUp(void)
		{