diff options
| author | Anna (navi) Figueiredo Gomes <navi@vlhl.dev> | 2024-03-22 20:06:01 +0100 |
|---|---|---|
| committer | Anna (navi) Figueiredo Gomes <navi@vlhl.dev> | 2024-03-22 21:08:51 +0100 |
| commit | 31d934d19bf82efdfc320fa7008008242a65332a (patch) | |
| tree | 8e89bcc49941adcbe0314f1a6a8117c7f11a6c0f | |
| parent | 107f1c4cee2ac6534c536efc3affae5e417e01fe (diff) | |
| download | hiredict-31d934d19bf82efdfc320fa7008008242a65332a.tar.xz | |
all: rename output files
Signed-off-by: Anna (navi) Figueiredo Gomes <navi@vlhl.dev>
41 files changed, 174 insertions, 173 deletions
@@ -5,6 +5,7 @@ /*.dylib /*.a /*.pc +build/ *.dSYM tags compile_commands.json diff --git a/.reuse/dep5 b/.reuse/dep5 index 8c2a37e..72e39a8 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -13,15 +13,15 @@ Files: .gitignore .travis.yml appveyor.yml Copyright: Salvatore Sanfilippo <antirez at gmail dot com> License: BSD-3-Clause -Files: hiredis.pc.in hiredis.targets hiredis_ssl.pc.in +Files: hiredict.pc.in hiredict.targets hiredict_ssl.pc.in Copyright: Salvatore Sanfilippo <antirez at gmail dot com> License: BSD-3-Clause -Files: hiredis-config.cmake.in hiredis_ssl-config.cmake.in +Files: hiredict-config.cmake.in hiredict_ssl-config.cmake.in Copyright: Salvatore Sanfilippo <antirez at gmail dot com> License: BSD-3-Clause -Files: hiredis.targets +Files: hiredict.targets Copyright: Salvatore Sanfilippo <antirez at gmail dot com> License: BSD-3-Clause diff --git a/CMakeLists.txt b/CMakeLists.txt index 4f12937..195934f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.0.0) MACRO(getVersionBit name) SET(VERSION_REGEX "^#define ${name} (.+)$") - FILE(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/hiredis.h" + FILE(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/hiredict.h" VERSION_BIT REGEX ${VERSION_REGEX}) STRING(REGEX REPLACE ${VERSION_REGEX} "\\1" ${name} "${VERSION_BIT}") ENDMACRO(getVersionBit) @@ -20,139 +20,138 @@ getVersionBit(HIREDIS_SONAME) SET(VERSION "${HIREDIS_MAJOR}.${HIREDIS_MINOR}.${HIREDIS_PATCH}") MESSAGE("Detected version: ${VERSION}") -PROJECT(hiredis LANGUAGES "C" VERSION "${VERSION}") +PROJECT(hiredict LANGUAGES "C" VERSION "${VERSION}") INCLUDE(GNUInstallDirs) OPTION(BUILD_SHARED_LIBS "Build shared libraries" ON) -OPTION(ENABLE_SSL "Build hiredis_ssl for SSL support" OFF) +OPTION(ENABLE_SSL "Build hiredict_ssl for SSL support" OFF) OPTION(DISABLE_TESTS "If tests should be compiled or not" OFF) OPTION(ENABLE_SSL_TESTS "Should we test SSL connections" OFF) -OPTION(ENABLE_EXAMPLES "Enable building hiredis examples" OFF) +OPTION(ENABLE_EXAMPLES "Enable building hiredict examples" OFF) OPTION(ENABLE_ASYNC_TESTS "Should we run all asynchronous API tests" OFF) # Historically, the NuGet file was always install; default # to ON for those who rely on that historical behaviour. OPTION(ENABLE_NUGET "Install NuGET packaging details" ON) -# Hiredis requires C99 +# Hiredict requires C99 SET(CMAKE_C_STANDARD 99) SET(CMAKE_DEBUG_POSTFIX d) -SET(hiredis_sources +SET(hiredict_sources alloc.c async.c - hiredis.c + hiredict.c net.c read.c sds.c sockcompat.c) -SET(hiredis_sources ${hiredis_sources}) +SET(hiredict_sources ${hiredict_sources}) IF(WIN32) ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS -DWIN32_LEAN_AND_MEAN) ENDIF() -ADD_LIBRARY(hiredis ${hiredis_sources}) -ADD_LIBRARY(hiredis::hiredis ALIAS hiredis) -set(hiredis_export_name hiredis CACHE STRING "Name of the exported target") -set_target_properties(hiredis PROPERTIES EXPORT_NAME ${hiredis_export_name}) +ADD_LIBRARY(hiredict ${hiredict_sources}) +ADD_LIBRARY(hiredict::hiredict ALIAS hiredict) +set(hiredict_export_name hiredict CACHE STRING "Name of the exported target") +set_target_properties(hiredict PROPERTIES EXPORT_NAME ${hiredict_export_name}) -SET_TARGET_PROPERTIES(hiredis +SET_TARGET_PROPERTIES(hiredict PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE - VERSION "${HIREDIS_SONAME}") + VERSION "${HIREDIS_SONAME}") IF(MSVC) - SET_TARGET_PROPERTIES(hiredis + SET_TARGET_PROPERTIES(hiredict PROPERTIES COMPILE_FLAGS /Z7) ENDIF() IF(WIN32) - TARGET_LINK_LIBRARIES(hiredis PUBLIC ws2_32 crypt32) + TARGET_LINK_LIBRARIES(hiredict PUBLIC ws2_32 crypt32) ELSEIF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") - TARGET_LINK_LIBRARIES(hiredis PUBLIC m) + TARGET_LINK_LIBRARIES(hiredict PUBLIC m) ELSEIF(CMAKE_SYSTEM_NAME MATCHES "SunOS") - TARGET_LINK_LIBRARIES(hiredis PUBLIC socket) + TARGET_LINK_LIBRARIES(hiredict PUBLIC socket) ENDIF() -TARGET_INCLUDE_DIRECTORIES(hiredis PUBLIC $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>) +TARGET_INCLUDE_DIRECTORIES(hiredict PUBLIC $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>) -CONFIGURE_FILE(hiredis.pc.in hiredis.pc @ONLY) +CONFIGURE_FILE(hiredict.pc.in hiredict.pc @ONLY) -set(CPACK_PACKAGE_VENDOR "Redis") +set(CPACK_PACKAGE_VENDOR "Redict") set(CPACK_PACKAGE_DESCRIPTION "\ -Hiredis is a minimalistic C client library for the Redis database. +Hiredict is a minimalistic C client library for the Redict database. It is minimalistic because it just adds minimal support for the protocol, \ but at the same time it uses a high level printf-alike API in order to make \ it much higher level than otherwise suggested by its minimal code base and the \ -lack of explicit bindings for every Redis command. +lack of explicit bindings for every Redict command. Apart from supporting sending commands and receiving replies, it comes with a \ reply parser that is decoupled from the I/O layer. It is a stream parser designed \ for easy reusability, which can for instance be used in higher level language bindings \ for efficient reply parsing. -Hiredis only supports the binary-safe Redis protocol, so you can use it with any Redis \ -version >= 1.2.0. +Hiredict only supports the binary-safe Redis protocol. The library comes with multiple APIs. There is the synchronous API, the asynchronous API \ and the reply parsing API.") -set(CPACK_PACKAGE_HOMEPAGE_URL "https://github.com/redis/hiredis") -set(CPACK_PACKAGE_CONTACT "michael dot grunder at gmail dot com") +set(CPACK_PACKAGE_HOMEPAGE_URL "https://codeberg.org/redict/hiredict") +set(CPACK_PACKAGE_CONTACT "navi@vlhl.dev") set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) set(CPACK_RPM_PACKAGE_AUTOREQPROV ON) include(CPack) -INSTALL(TARGETS hiredis - EXPORT hiredis-targets +INSTALL(TARGETS hiredict + EXPORT hiredict-targets RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) if (MSVC AND BUILD_SHARED_LIBS) - INSTALL(FILES $<TARGET_PDB_FILE:hiredis> + INSTALL(FILES $<TARGET_PDB_FILE:hiredict> DESTINATION ${CMAKE_INSTALL_BINDIR} CONFIGURATIONS Debug RelWithDebInfo) endif() if (ENABLE_NUGET) # For NuGet packages - INSTALL(FILES hiredis.targets + INSTALL(FILES hiredict.targets DESTINATION build/native) endif() -INSTALL(FILES hiredis.h read.h sds.h async.h alloc.h sockcompat.h - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/hiredis) +INSTALL(FILES hiredict.h read.h sds.h async.h alloc.h sockcompat.h + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/hiredict) INSTALL(DIRECTORY adapters - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/hiredis) + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/hiredict) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/hiredis.pc +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/hiredict.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) -export(EXPORT hiredis-targets - FILE "${CMAKE_CURRENT_BINARY_DIR}/hiredis-targets.cmake" - NAMESPACE hiredis::) +export(EXPORT hiredict-targets + FILE "${CMAKE_CURRENT_BINARY_DIR}/hiredict-targets.cmake" + NAMESPACE hiredict::) if(WIN32) - SET(CMAKE_CONF_INSTALL_DIR share/hiredis) + SET(CMAKE_CONF_INSTALL_DIR share/hiredict) else() - SET(CMAKE_CONF_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/hiredis) + SET(CMAKE_CONF_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/hiredict) endif() SET(INCLUDE_INSTALL_DIR include) include(CMakePackageConfigHelpers) -write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/hiredis-config-version.cmake" +write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/hiredict-config-version.cmake" COMPATIBILITY SameMajorVersion) -configure_package_config_file(hiredis-config.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/hiredis-config.cmake +configure_package_config_file(hiredict-config.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/hiredict-config.cmake INSTALL_DESTINATION ${CMAKE_CONF_INSTALL_DIR} PATH_VARS INCLUDE_INSTALL_DIR) -INSTALL(EXPORT hiredis-targets - FILE hiredis-targets.cmake - NAMESPACE hiredis:: +INSTALL(EXPORT hiredict-targets + FILE hiredict-targets.cmake + NAMESPACE hiredict:: DESTINATION ${CMAKE_CONF_INSTALL_DIR}) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/hiredis-config.cmake - ${CMAKE_CURRENT_BINARY_DIR}/hiredis-config-version.cmake +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/hiredict-config.cmake + ${CMAKE_CURRENT_BINARY_DIR}/hiredict-config-version.cmake DESTINATION ${CMAKE_CONF_INSTALL_DIR}) @@ -163,82 +162,83 @@ IF(ENABLE_SSL) ENDIF() ENDIF() FIND_PACKAGE(OpenSSL REQUIRED) - SET(hiredis_ssl_sources + SET(hiredict_ssl_sources ssl.c) - ADD_LIBRARY(hiredis_ssl ${hiredis_ssl_sources}) - ADD_LIBRARY(hiredis::hiredis_ssl ALIAS hiredis_ssl) + ADD_LIBRARY(hiredict_ssl ${hiredict_ssl_sources}) + ADD_LIBRARY(hiredict::hiredict_ssl ALIAS hiredict_ssl) IF (APPLE AND BUILD_SHARED_LIBS) - SET_PROPERTY(TARGET hiredis_ssl PROPERTY LINK_FLAGS "-Wl,-undefined -Wl,dynamic_lookup") + SET_PROPERTY(TARGET hiredict_ssl PROPERTY LINK_FLAGS "-Wl,-undefined -Wl,dynamic_lookup") ENDIF() - SET_TARGET_PROPERTIES(hiredis_ssl + SET_TARGET_PROPERTIES(hiredict_ssl PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE - VERSION "${HIREDIS_SONAME}") + VERSION "${HIREDIS_SONAME}") IF(MSVC) - SET_TARGET_PROPERTIES(hiredis_ssl + SET_TARGET_PROPERTIES(hiredict_ssl PROPERTIES COMPILE_FLAGS /Z7) ENDIF() - TARGET_LINK_LIBRARIES(hiredis_ssl PRIVATE OpenSSL::SSL) + TARGET_LINK_LIBRARIES(hiredict_ssl PRIVATE OpenSSL::SSL) IF(WIN32) - TARGET_LINK_LIBRARIES(hiredis_ssl PRIVATE hiredis) + TARGET_LINK_LIBRARIES(hiredict_ssl PRIVATE hiredict) ENDIF() - CONFIGURE_FILE(hiredis_ssl.pc.in hiredis_ssl.pc @ONLY) + CONFIGURE_FILE(hiredict_ssl.pc.in hiredict_ssl.pc @ONLY) - INSTALL(TARGETS hiredis_ssl - EXPORT hiredis_ssl-targets + INSTALL(TARGETS hiredict_ssl + EXPORT hiredict_ssl-targets RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) if (MSVC AND BUILD_SHARED_LIBS) - INSTALL(FILES $<TARGET_PDB_FILE:hiredis_ssl> + INSTALL(FILES $<TARGET_PDB_FILE:hiredict_ssl> DESTINATION ${CMAKE_INSTALL_BINDIR} CONFIGURATIONS Debug RelWithDebInfo) endif() - INSTALL(FILES hiredis_ssl.h - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/hiredis) + INSTALL(FILES hiredict_ssl.h + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/hiredict) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/hiredis_ssl.pc + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/hiredict_ssl.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) - export(EXPORT hiredis_ssl-targets - FILE "${CMAKE_CURRENT_BINARY_DIR}/hiredis_ssl-targets.cmake" - NAMESPACE hiredis::) + export(EXPORT hiredict_ssl-targets + FILE "${CMAKE_CURRENT_BINARY_DIR}/hiredict_ssl-targets.cmake" + NAMESPACE hiredict::) if(WIN32) - SET(CMAKE_CONF_INSTALL_DIR share/hiredis_ssl) + SET(CMAKE_CONF_INSTALL_DIR share/hiredict_ssl) else() - SET(CMAKE_CONF_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/hiredis_ssl) + SET(CMAKE_CONF_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/hiredict_ssl) endif() - configure_package_config_file(hiredis_ssl-config.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/hiredis_ssl-config.cmake + configure_package_config_file(hiredict_ssl-config.cmake.in + ${CMAKE_CURRENT_BINARY_DIR}/hiredict_ssl-config.cmake INSTALL_DESTINATION ${CMAKE_CONF_INSTALL_DIR} PATH_VARS INCLUDE_INSTALL_DIR) - INSTALL(EXPORT hiredis_ssl-targets - FILE hiredis_ssl-targets.cmake - NAMESPACE hiredis:: + INSTALL(EXPORT hiredict_ssl-targets + FILE hiredict_ssl-targets.cmake + NAMESPACE hiredict:: DESTINATION ${CMAKE_CONF_INSTALL_DIR}) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/hiredis_ssl-config.cmake + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/hiredict_ssl-config.cmake DESTINATION ${CMAKE_CONF_INSTALL_DIR}) ENDIF() IF(NOT DISABLE_TESTS) ENABLE_TESTING() - ADD_EXECUTABLE(hiredis-test test.c) - TARGET_LINK_LIBRARIES(hiredis-test hiredis) + ADD_EXECUTABLE(hiredict-test test.c) + TARGET_LINK_LIBRARIES(hiredict-test hiredict) IF(ENABLE_SSL_TESTS) - ADD_DEFINITIONS(-DHIREDIS_TEST_SSL=1) - TARGET_LINK_LIBRARIES(hiredis-test hiredis_ssl) + ADD_DEFINITIONS(-DHIREDIS_TEST_SSL=1) + TARGET_LINK_LIBRARIES(hiredict-test hiredict_ssl) ENDIF() IF(ENABLE_ASYNC_TESTS) - ADD_DEFINITIONS(-DHIREDIS_TEST_ASYNC=1) - TARGET_LINK_LIBRARIES(hiredis-test event) + ADD_DEFINITIONS(-DHIREDIS_TEST_ASYNC=1) + TARGET_LINK_LIBRARIES(hiredict-test event) ENDIF() - ADD_TEST(NAME hiredis-test + ADD_TEST(NAME hiredict-test COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/test.sh) ENDIF() @@ -9,35 +9,35 @@ # SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: LGPL-3.0-or-later -OBJ=alloc.o net.o hiredis.o sds.o async.o read.o sockcompat.o -EXAMPLES=hiredis-example hiredis-example-libevent hiredis-example-libev hiredis-example-glib hiredis-example-push hiredis-example-poll -TESTS=hiredis-test -LIBNAME=libhiredis -PKGCONFNAME=hiredis.pc +OBJ=alloc.o net.o hiredict.o sds.o async.o read.o sockcompat.o +EXAMPLES=hiredict-example hiredict-example-libevent hiredict-example-libev hiredict-example-glib hiredict-example-push hiredict-example-poll +TESTS=hiredict-test +LIBNAME=libhiredict +PKGCONFNAME=hiredict.pc -HIREDIS_MAJOR=$(shell grep HIREDIS_MAJOR hiredis.h | awk '{print $$3}') -HIREDIS_MINOR=$(shell grep HIREDIS_MINOR hiredis.h | awk '{print $$3}') -HIREDIS_PATCH=$(shell grep HIREDIS_PATCH hiredis.h | awk '{print $$3}') -HIREDIS_SONAME=$(shell grep HIREDIS_SONAME hiredis.h | awk '{print $$3}') +HIREDIS_MAJOR=$(shell grep HIREDIS_MAJOR hiredict.h | awk '{print $$3}') +HIREDIS_MINOR=$(shell grep HIREDIS_MINOR hiredict.h | awk '{print $$3}') +HIREDIS_PATCH=$(shell grep HIREDIS_PATCH hiredict.h | awk '{print $$3}') +HIREDIS_SONAME=$(shell grep HIREDIS_SONAME hiredict.h | awk '{print $$3}') # Installation related variables and target PREFIX?=/usr/local -INCLUDE_PATH?=include/hiredis +INCLUDE_PATH?=include/hiredict LIBRARY_PATH?=lib PKGCONF_PATH?=pkgconfig INSTALL_INCLUDE_PATH= $(DESTDIR)$(PREFIX)/$(INCLUDE_PATH) INSTALL_LIBRARY_PATH= $(DESTDIR)$(PREFIX)/$(LIBRARY_PATH) INSTALL_PKGCONF_PATH= $(INSTALL_LIBRARY_PATH)/$(PKGCONF_PATH) -# redis-server configuration used for testing +# redict-server configuration used for testing REDIS_PORT=56379 -REDIS_SERVER=redis-server +REDIS_SERVER=redict-server define REDIS_TEST_CONFIG daemonize yes - pidfile /tmp/hiredis-test-redis.pid + pidfile /tmp/hiredict-test-redict.pid port $(REDIS_PORT) bind 127.0.0.1 - unixsocket /tmp/hiredis-test-redis.sock + unixsocket /tmp/hiredict-test-redict.sock endef export REDIS_TEST_CONFIG @@ -66,8 +66,8 @@ STLIB_MAKE_CMD=$(AR) rcs #################### SSL variables start #################### SSL_OBJ=ssl.o -SSL_LIBNAME=libhiredis_ssl -SSL_PKGCONFNAME=hiredis_ssl.pc +SSL_LIBNAME=libhiredict_ssl +SSL_PKGCONFNAME=hiredict_ssl.pc SSL_INSTALLNAME=install-ssl SSL_DYLIB_MINOR_NAME=$(SSL_LIBNAME).$(DYLIBSUFFIX).$(HIREDIS_SONAME) SSL_DYLIB_MAJOR_NAME=$(SSL_LIBNAME).$(DYLIBSUFFIX).$(HIREDIS_MAJOR) @@ -79,7 +79,7 @@ USE_SSL?=0 ifeq ($(USE_SSL),1) # This is required for test.c only CFLAGS+=-DHIREDIS_TEST_SSL - EXAMPLES+=hiredis-example-ssl hiredis-example-libevent-ssl + EXAMPLES+=hiredict-example-ssl hiredict-example-libevent-ssl SSL_STLIB=$(SSL_STLIBNAME) SSL_DYLIB=$(SSL_DYLIBNAME) SSL_PKGCONF=$(SSL_PKGCONFNAME) @@ -152,7 +152,7 @@ ifeq ($(uname_S),Darwin) DYLIB_PLUGIN=-Wl,-undefined -Wl,dynamic_lookup endif -all: dynamic static hiredis-test pkgconfig +all: dynamic static hiredict-test pkgconfig dynamic: $(DYLIBNAME) $(SSL_DYLIB) @@ -162,14 +162,14 @@ pkgconfig: $(PKGCONFNAME) $(SSL_PKGCONF) # Deps (use make dep to generate this) alloc.o: alloc.c fmacros.h alloc.h -async.o: async.c fmacros.h alloc.h async.h hiredis.h read.h sds.h net.h dict.c dict.h win32.h async_private.h +async.o: async.c fmacros.h alloc.h async.h hiredict.h read.h sds.h net.h dict.c dict.h win32.h async_private.h dict.o: dict.c fmacros.h alloc.h dict.h -hiredis.o: hiredis.c fmacros.h hiredis.h read.h sds.h alloc.h net.h async.h win32.h -net.o: net.c fmacros.h net.h hiredis.h read.h sds.h alloc.h sockcompat.h win32.h +hiredict.o: hiredict.c fmacros.h hiredict.h read.h sds.h alloc.h net.h async.h win32.h +net.o: net.c fmacros.h net.h hiredict.h read.h sds.h alloc.h sockcompat.h win32.h read.o: read.c fmacros.h alloc.h read.h sds.h win32.h sds.o: sds.c sds.h sdsalloc.h alloc.h sockcompat.o: sockcompat.c sockcompat.h -test.o: test.c fmacros.h hiredis.h read.h sds.h alloc.h net.h sockcompat.h win32.h +test.o: test.c fmacros.h hiredict.h read.h sds.h alloc.h net.h sockcompat.h win32.h $(DYLIBNAME): $(OBJ) $(DYLIB_MAKE_CMD) -o $(DYLIBNAME) $(OBJ) $(REAL_LDFLAGS) @@ -184,62 +184,62 @@ $(SSL_DYLIBNAME): $(SSL_OBJ) $(SSL_STLIBNAME): $(SSL_OBJ) $(STLIB_MAKE_CMD) $(SSL_STLIBNAME) $(SSL_OBJ) -$(SSL_OBJ): ssl.c hiredis.h read.h sds.h alloc.h async.h win32.h async_private.h +$(SSL_OBJ): ssl.c hiredict.h read.h sds.h alloc.h async.h win32.h async_private.h #################### SSL building rules end #################### # Binaries: -hiredis-example-libevent: examples/example-libevent.c adapters/libevent.h $(STLIBNAME) +hiredict-example-libevent: examples/example-libevent.c adapters/libevent.h $(STLIBNAME) $(CC) -o examples/$@ $(REAL_CFLAGS) -I. $< -levent $(STLIBNAME) $(REAL_LDFLAGS) -hiredis-example-libevent-ssl: examples/example-libevent-ssl.c adapters/libevent.h $(STLIBNAME) $(SSL_STLIBNAME) +hiredict-example-libevent-ssl: examples/example-libevent-ssl.c adapters/libevent.h $(STLIBNAME) $(SSL_STLIBNAME) $(CC) -o examples/$@ $(REAL_CFLAGS) -I. $< -levent $(STLIBNAME) $(SSL_STLIBNAME) $(REAL_LDFLAGS) $(SSL_LDFLAGS) -hiredis-example-libev: examples/example-libev.c adapters/libev.h $(STLIBNAME) +hiredict-example-libev: examples/example-libev.c adapters/libev.h $(STLIBNAME) $(CC) -o examples/$@ $(REAL_CFLAGS) -I. $< -lev $(STLIBNAME) $(REAL_LDFLAGS) -hiredis-example-libhv: examples/example-libhv.c adapters/libhv.h $(STLIBNAME) +hiredict-example-libhv: examples/example-libhv.c adapters/libhv.h $(STLIBNAME) $(CC) -o examples/$@ $(REAL_CFLAGS) -I. $< -lhv $(STLIBNAME) $(REAL_LDFLAGS) -hiredis-example-glib: examples/example-glib.c adapters/glib.h $(STLIBNAME) +hiredict-example-glib: examples/example-glib.c adapters/glib.h $(STLIBNAME) $(CC) -o examples/$@ $(REAL_CFLAGS) -I. $< $(shell pkg-config --cflags --libs glib-2.0) $(STLIBNAME) $(REAL_LDFLAGS) -hiredis-example-ivykis: examples/example-ivykis.c adapters/ivykis.h $(STLIBNAME) +hiredict-example-ivykis: examples/example-ivykis.c adapters/ivykis.h $(STLIBNAME) $(CC) -o examples/$@ $(REAL_CFLAGS) -I. $< -livykis $(STLIBNAME) $(REAL_LDFLAGS) -hiredis-example-macosx: examples/example-macosx.c adapters/macosx.h $(STLIBNAME) +hiredict-example-macosx: examples/example-macosx.c adapters/macosx.h $(STLIBNAME) $(CC) -o examples/$@ $(REAL_CFLAGS) -I. $< -framework CoreFoundation $(STLIBNAME) $(REAL_LDFLAGS) -hiredis-example-ssl: examples/example-ssl.c $(STLIBNAME) $(SSL_STLIBNAME) +hiredict-example-ssl: examples/example-ssl.c $(STLIBNAME) $(SSL_STLIBNAME) $(CC) -o examples/$@ $(REAL_CFLAGS) -I. $< $(STLIBNAME) $(SSL_STLIBNAME) $(REAL_LDFLAGS) $(SSL_LDFLAGS) -hiredis-example-poll: examples/example-poll.c adapters/poll.h $(STLIBNAME) +hiredict-example-poll: examples/example-poll.c adapters/poll.h $(STLIBNAME) $(CC) -o examples/$@ $(REAL_CFLAGS) -I. $< $(STLIBNAME) $(REAL_LDFLAGS) ifndef AE_DIR -hiredis-example-ae: - @echo "Please specify AE_DIR (e.g. <redis repository>/src)" +hiredict-example-ae: + @echo "Please specify AE_DIR (e.g. <redict repository>/src)" @false else -hiredis-example-ae: examples/example-ae.c adapters/ae.h $(STLIBNAME) +hiredict-example-ae: examples/example-ae.c adapters/ae.h $(STLIBNAME) $(CC) -o examples/$@ $(REAL_CFLAGS) $(REAL_LDFLAGS) -I. -I$(AE_DIR) $< $(AE_DIR)/ae.o $(AE_DIR)/zmalloc.o $(AE_DIR)/../deps/jemalloc/lib/libjemalloc.a -pthread $(STLIBNAME) endif ifndef LIBUV_DIR # dynamic link libuv.so -hiredis-example-libuv: examples/example-libuv.c adapters/libuv.h $(STLIBNAME) +hiredict-example-libuv: examples/example-libuv.c adapters/libuv.h $(STLIBNAME) $(CC) -o examples/$@ $(REAL_CFLAGS) -I. -I$(LIBUV_DIR)/include $< -luv -lpthread -lrt $(STLIBNAME) $(REAL_LDFLAGS) else # use user provided static lib -hiredis-example-libuv: examples/example-libuv.c adapters/libuv.h $(STLIBNAME) +hiredict-example-libuv: examples/example-libuv.c adapters/libuv.h $(STLIBNAME) $(CC) -o examples/$@ $(REAL_CFLAGS) -I. -I$(LIBUV_DIR)/include $< $(LIBUV_DIR)/.libs/libuv.a -lpthread -lrt $(STLIBNAME) $(REAL_LDFLAGS) endif ifeq ($(and $(QT_MOC),$(QT_INCLUDE_DIR),$(QT_LIBRARY_DIR)),) -hiredis-example-qt: +hiredict-example-qt: @echo "Please specify QT_MOC, QT_INCLUDE_DIR AND QT_LIBRARY_DIR" @false else -hiredis-example-qt: examples/example-qt.cpp adapters/qt.h $(STLIBNAME) +hiredict-example-qt: examples/example-qt.cpp adapters/qt.h $(STLIBNAME) $(QT_MOC) adapters/qt.h -I. -I$(QT_INCLUDE_DIR) -I$(QT_INCLUDE_DIR)/QtCore | \ $(CXX) -x c++ -o qt-adapter-moc.o -c - $(REAL_CFLAGS) -I. -I$(QT_INCLUDE_DIR) -I$(QT_INCLUDE_DIR)/QtCore $(QT_MOC) examples/example-qt.h -I. -I$(QT_INCLUDE_DIR) -I$(QT_INCLUDE_DIR)/QtCore | \ @@ -247,10 +247,10 @@ hiredis-example-qt: examples/example-qt.cpp adapters/qt.h $(STLIBNAME) $(CXX) -o examples/$@ $(REAL_CFLAGS) $(REAL_LDFLAGS) -I. -I$(QT_INCLUDE_DIR) -I$(QT_INCLUDE_DIR)/QtCore -L$(QT_LIBRARY_DIR) qt-adapter-moc.o qt-example-moc.o $< -pthread $(STLIBNAME) -lQtCore endif -hiredis-example: examples/example.c $(STLIBNAME) +hiredict-example: examples/example.c $(STLIBNAME) $(CC) -o examples/$@ $(REAL_CFLAGS) -I. $< $(STLIBNAME) $(REAL_LDFLAGS) -hiredis-example-push: examples/example-push.c $(STLIBNAME) +hiredict-example-push: examples/example-push.c $(STLIBNAME) $(CC) -o examples/$@ $(REAL_CFLAGS) -I. $< $(STLIBNAME) $(REAL_LDFLAGS) examples: $(EXAMPLES) @@ -264,30 +264,30 @@ ifeq ($(TEST_ASYNC),1) TEST_LDFLAGS += -levent endif -hiredis-test: test.o $(TEST_LIBS) +hiredict-test: test.o $(TEST_LIBS) $(CC) -o $@ $(REAL_CFLAGS) -I. $^ $(REAL_LDFLAGS) $(TEST_LDFLAGS) -hiredis-%: %.o $(STLIBNAME) +hiredict-%: %.o $(STLIBNAME) $(CC) $(REAL_CFLAGS) -o $@ $< $(TEST_LIBS) $(REAL_LDFLAGS) -test: hiredis-test - ./hiredis-test +test: hiredict-test + ./hiredict-test -check: hiredis-test +check: hiredict-test TEST_SSL=$(USE_SSL) ./test.sh .c.o: $(CC) -std=c99 -c $(REAL_CFLAGS) $< clean: - rm -rf $(DYLIBNAME) $(STLIBNAME) $(SSL_DYLIBNAME) $(SSL_STLIBNAME) $(TESTS) $(PKGCONFNAME) examples/hiredis-example* *.o *.gcda *.gcno *.gcov + rm -rf $(DYLIBNAME) $(STLIBNAME) $(SSL_DYLIBNAME) $(SSL_STLIBNAME) $(TESTS) $(PKGCONFNAME) examples/hiredict-example* *.o *.gcda *.gcno *.gcov dep: $(CC) $(CPPFLAGS) $(CFLAGS) -MM *.c INSTALL?= cp -pPR -$(PKGCONFNAME): hiredis.h +$(PKGCONFNAME): hiredict.h @echo "Generating $@ for pkgconfig..." @echo prefix=$(PREFIX) > $@ @echo exec_prefix=\$${prefix} >> $@ @@ -295,13 +295,13 @@ $(PKGCONFNAME): hiredis.h @echo includedir=$(PREFIX)/include >> $@ @echo pkgincludedir=$(PREFIX)/$(INCLUDE_PATH) >> $@ @echo >> $@ - @echo Name: hiredis >> $@ + @echo Name: hiredict >> $@ @echo Description: Minimalistic C client library for Redis. >> $@ @echo Version: $(HIREDIS_MAJOR).$(HIREDIS_MINOR).$(HIREDIS_PATCH) >> $@ - @echo Libs: -L\$${libdir} -lhiredis >> $@ + @echo Libs: -L\$${libdir} -lhiredict >> $@ @echo Cflags: -I\$${pkgincludedir} -I\$${includedir} -D_FILE_OFFSET_BITS=64 >> $@ -$(SSL_PKGCONFNAME): hiredis_ssl.h +$(SSL_PKGCONFNAME): hiredict_ssl.h @echo "Generating $@ for pkgconfig..." @echo prefix=$(PREFIX) > $@ @echo exec_prefix=\$${prefix} >> $@ @@ -309,16 +309,16 @@ $(SSL_PKGCONFNAME): hiredis_ssl.h @echo includedir=$(PREFIX)/include >> $@ @echo pkgincludedir=$(PREFIX)/$(INCLUDE_PATH) >> $@ @echo >> $@ - @echo Name: hiredis_ssl >> $@ - @echo Description: SSL Support for hiredis. >> $@ + @echo Name: hiredict_ssl >> $@ + @echo Description: SSL Support for hiredict. >> $@ @echo Version: $(HIREDIS_MAJOR).$(HIREDIS_MINOR).$(HIREDIS_PATCH) >> $@ - @echo Requires: hiredis >> $@ - @echo Libs: -L\$${libdir} -lhiredis_ssl >> $@ + @echo Requires: hiredict >> $@ + @echo Libs: -L\$${libdir} -lhiredict_ssl >> $@ @echo Libs.private: -lssl -lcrypto >> $@ install: $(DYLIBNAME) $(STLIBNAME) $(PKGCONFNAME) $(SSL_INSTALL) mkdir -p $(INSTALL_INCLUDE_PATH) $(INSTALL_INCLUDE_PATH)/adapters $(INSTALL_LIBRARY_PATH) - $(INSTALL) hiredis.h async.h read.h sds.h alloc.h sockcompat.h $(INSTALL_INCLUDE_PATH) + $(INSTALL) hiredict.h async.h read.h sds.h alloc.h sockcompat.h $(INSTALL_INCLUDE_PATH) $(INSTALL) adapters/*.h $(INSTALL_INCLUDE_PATH)/adapters $(INSTALL) $(DYLIBNAME) $(INSTALL_LIBRARY_PATH)/$(DYLIB_MINOR_NAME) cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MINOR_NAME) $(DYLIBNAME) && ln -sf $(DYLIB_MINOR_NAME) $(DYLIB_MAJOR_NAME) @@ -328,7 +328,7 @@ install: $(DYLIBNAME) $(STLIBNAME) $(PKGCONFNAME) $(SSL_INSTALL) install-ssl: $(SSL_DYLIBNAME) $(SSL_STLIBNAME) $(SSL_PKGCONFNAME) mkdir -p $(INSTALL_INCLUDE_PATH) $(INSTALL_LIBRARY_PATH) - $(INSTALL) hiredis_ssl.h $(INSTALL_INCLUDE_PATH) + $(INSTALL) hiredict_ssl.h $(INSTALL_INCLUDE_PATH) $(INSTALL) $(SSL_DYLIBNAME) $(INSTALL_LIBRARY_PATH)/$(SSL_DYLIB_MINOR_NAME) cd $(INSTALL_LIBRARY_PATH) && ln -sf $(SSL_DYLIB_MINOR_NAME) $(SSL_DYLIBNAME) && ln -sf $(SSL_DYLIB_MINOR_NAME) $(SSL_DYLIB_MAJOR_NAME) $(INSTALL) $(SSL_STLIBNAME) $(INSTALL_LIBRARY_PATH) @@ -354,9 +354,9 @@ gcov: coverage: gcov make check mkdir -p tmp/lcov - lcov -d . -c --exclude '/usr*' -o tmp/lcov/hiredis.info - lcov -q -l tmp/lcov/hiredis.info - genhtml --legend -q -o tmp/lcov/report tmp/lcov/hiredis.info + lcov -d . -c --exclude '/usr*' -o tmp/lcov/hiredict.info + lcov -q -l tmp/lcov/hiredict.info + genhtml --legend -q -o tmp/lcov/report tmp/lcov/hiredict.info noopt: $(MAKE) OPTIMIZATION="" diff --git a/adapters/ae.h b/adapters/ae.h index 9923f1b..44db8ee 100644 --- a/adapters/ae.h +++ b/adapters/ae.h @@ -13,7 +13,7 @@ #define __HIREDIS_AE_H__ #include <sys/types.h> #include <ae.h> -#include "../hiredis.h" +#include "../hiredict.h" #include "../async.h" typedef struct redisAeEvents { diff --git a/adapters/glib.h b/adapters/glib.h index 3b6772c..f3143ed 100644 --- a/adapters/glib.h +++ b/adapters/glib.h @@ -14,7 +14,7 @@ #include <glib.h> -#include "../hiredis.h" +#include "../hiredict.h" #include "../async.h" typedef struct diff --git a/adapters/ivykis.h b/adapters/ivykis.h index 3de8d0c..544723d 100644 --- a/adapters/ivykis.h +++ b/adapters/ivykis.h @@ -12,7 +12,7 @@ #ifndef __HIREDIS_IVYKIS_H__ #define __HIREDIS_IVYKIS_H__ #include <iv.h> -#include "../hiredis.h" +#include "../hiredict.h" #include "../async.h" typedef struct redisIvykisEvents { diff --git a/adapters/libev.h b/adapters/libev.h index ad8e79c..265e642 100644 --- a/adapters/libev.h +++ b/adapters/libev.h @@ -16,7 +16,7 @@ #include <stdlib.h> #include <sys/types.h> #include <ev.h> -#include "../hiredis.h" +#include "../hiredict.h" #include "../async.h" typedef struct redisLibevEvents { diff --git a/adapters/libevent.h b/adapters/libevent.h index c7cc4e7..936c37e 100644 --- a/adapters/libevent.h +++ b/adapters/libevent.h @@ -12,7 +12,7 @@ #ifndef __HIREDIS_LIBEVENT_H__ #define __HIREDIS_LIBEVENT_H__ #include <event2/event.h> -#include "../hiredis.h" +#include "../hiredict.h" #include "../async.h" #define REDIS_LIBEVENT_DELETED 0x01 diff --git a/adapters/libhv.h b/adapters/libhv.h index 3dd6978..4955bb4 100644 --- a/adapters/libhv.h +++ b/adapters/libhv.h @@ -13,7 +13,7 @@ #define __HIREDIS_LIBHV_H__ #include <hv/hloop.h> -#include "../hiredis.h" +#include "../hiredict.h" #include "../async.h" typedef struct redisLibhvEvents { diff --git a/adapters/libsdevent.h b/adapters/libsdevent.h index 74364a5..dc4249a 100644 --- a/adapters/libsdevent.h +++ b/adapters/libsdevent.h @@ -12,7 +12,7 @@ #ifndef HIREDIS_LIBSDEVENT_H #define HIREDIS_LIBSDEVENT_H #include <systemd/sd-event.h> -#include "../hiredis.h" +#include "../hiredict.h" #include "../async.h" #define REDIS_LIBSDEVENT_DELETED 0x01 diff --git a/adapters/libuv.h b/adapters/libuv.h index 85e12ed..317d5e1 100644 --- a/adapters/libuv.h +++ b/adapters/libuv.h @@ -13,7 +13,7 @@ #define __HIREDIS_LIBUV_H__ #include <stdlib.h> #include <uv.h> -#include "../hiredis.h" +#include "../hiredict.h" #include "../async.h" #include <string.h> diff --git a/adapters/macosx.h b/adapters/macosx.h index fafd43b..7ae5e5a 100644 --- a/adapters/macosx.h +++ b/adapters/macosx.h @@ -14,7 +14,7 @@ #include <CoreFoundation/CoreFoundation.h> -#include "../hiredis.h" +#include "../hiredict.h" #include "../async.h" typedef struct { diff --git a/adapters/redismoduleapi.h b/adapters/redismoduleapi.h index 4614b8d..b9bf922 100644 --- a/adapters/redismoduleapi.h +++ b/adapters/redismoduleapi.h @@ -15,7 +15,7 @@ #include "redismodule.h" #include "../async.h" -#include "../hiredis.h" +#include "../hiredict.h" #include <sys/types.h> @@ -13,7 +13,7 @@ #ifndef __HIREDIS_ASYNC_H #define __HIREDIS_ASYNC_H -#include "hiredis.h" +#include "hiredict.h" #ifdef __cplusplus extern "C" { diff --git a/examples/example-ae.c b/examples/example-ae.c index 838a967..983ca9c 100644 --- a/examples/example-ae.c +++ b/examples/example-ae.c @@ -9,7 +9,7 @@ #include <string.h> #include <signal.h> -#include <hiredis.h> +#include <hiredict.h> #include <async.h> #include <adapters/ae.h> diff --git a/examples/example-glib.c b/examples/example-glib.c index eea9acc..46aa550 100644 --- a/examples/example-glib.c +++ b/examples/example-glib.c @@ -6,7 +6,7 @@ #include <stdlib.h> -#include <hiredis.h> +#include <hiredict.h> #include <async.h> #include <adapters/glib.h> diff --git a/examples/example-ivykis.c b/examples/example-ivykis.c index a581e02..989fa12 100644 --- a/examples/example-ivykis.c +++ b/examples/example-ivykis.c @@ -9,7 +9,7 @@ #include <string.h> #include <signal.h> -#include <hiredis.h> +#include <hiredict.h> #include <async.h> #include <adapters/ivykis.h> diff --git a/examples/example-libev.c b/examples/example-libev.c index cc6d27f..ade7ed1 100644 --- a/examples/example-libev.c +++ b/examples/example-libev.c @@ -9,7 +9,7 @@ #include <string.h> #include <signal.h> -#include <hiredis.h> +#include <hiredict.h> #include <async.h> #include <adapters/libev.h> diff --git a/examples/example-libevent-ssl.c b/examples/example-libevent-ssl.c index 99f8ebf..b2c6b56 100644 --- a/examples/example-libevent-ssl.c +++ b/examples/example-libevent-ssl.c @@ -9,7 +9,7 @@ #include <string.h> #include <signal.h> -#include <hiredis.h> +#include <hiredict.h> #include <hiredis_ssl.h> #include <async.h> #include <adapters/libevent.h> diff --git a/examples/example-libevent.c b/examples/example-libevent.c index d0d3c79..747f343 100644 --- a/examples/example-libevent.c +++ b/examples/example-libevent.c @@ -9,7 +9,7 @@ #include <string.h> #include <signal.h> -#include <hiredis.h> +#include <hiredict.h> #include <async.h> #include <adapters/libevent.h> diff --git a/examples/example-libhv.c b/examples/example-libhv.c index a69f236..4878039 100644 --- a/examples/example-libhv.c +++ b/examples/example-libhv.c @@ -9,7 +9,7 @@ #include <string.h> #include <signal.h> -#include <hiredis.h> +#include <hiredict.h> #include <async.h> #include <adapters/libhv.h> diff --git a/examples/example-libsdevent.c b/examples/example-libsdevent.c index adc54f9..8599b76 100644 --- a/examples/example-libsdevent.c +++ b/examples/example-libsdevent.c @@ -9,7 +9,7 @@ #include <string.h> #include <signal.h> -#include <hiredis.h> +#include <hiredict.h> #include <async.h> #include <adapters/libsdevent.h> diff --git a/examples/example-libuv.c b/examples/example-libuv.c index b92a29f..7d0e624 100644 --- a/examples/example-libuv.c +++ b/examples/example-libuv.c @@ -9,7 +9,7 @@ #include <string.h> #include <signal.h> -#include <hiredis.h> +#include <hiredict.h> #include <async.h> #include <adapters/libuv.h> diff --git a/examples/example-macosx.c b/examples/example-macosx.c index 9e85627..659d3b5 100644 --- a/examples/example-macosx.c +++ b/examples/example-macosx.c @@ -8,7 +8,7 @@ #include <stdio.h> -#include <hiredis.h> +#include <hiredict.h> #include <async.h> #include <adapters/macosx.h> diff --git a/examples/example-push.c b/examples/example-push.c index 2003bad..a00422f 100644 --- a/examples/example-push.c +++ b/examples/example-push.c @@ -9,7 +9,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <hiredis.h> +#include <hiredict.h> #define KEY_COUNT 5 diff --git a/examples/example-redismoduleapi.c b/examples/example-redismoduleapi.c index 3bbbbc5..37bba9c 100644 --- a/examples/example-redismoduleapi.c +++ b/examples/example-redismoduleapi.c @@ -9,7 +9,7 @@ #include <string.h> #include <signal.h> -#include <hiredis.h> +#include <hiredict.h> #include <async.h> #include <adapters/redismoduleapi.h> diff --git a/examples/example-ssl.c b/examples/example-ssl.c index 03cf556..1654f5d 100644 --- a/examples/example-ssl.c +++ b/examples/example-ssl.c @@ -8,7 +8,7 @@ #include <stdlib.h> #include <string.h> -#include <hiredis.h> +#include <hiredict.h> #include <hiredis_ssl.h> #ifdef _MSC_VER diff --git a/examples/example.c b/examples/example.c index e2c1842..a87e5cf 100644 --- a/examples/example.c +++ b/examples/example.c @@ -7,7 +7,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <hiredis.h> +#include <hiredict.h> #ifdef _MSC_VER #include <winsock2.h> /* For struct timeval */ diff --git a/fuzzing/format_command_fuzzer.c b/fuzzing/format_command_fuzzer.c index 65d8b91..99fde7b 100644 --- a/fuzzing/format_command_fuzzer.c +++ b/fuzzing/format_command_fuzzer.c @@ -17,7 +17,7 @@ #include <stdlib.h> #include <string.h> -#include "hiredis.h" +#include "hiredict.h" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { char *new_str, *cmd; diff --git a/hiredis-config.cmake.in b/hiredict-config.cmake.in index 0339858..0339858 100644 --- a/hiredis-config.cmake.in +++ b/hiredict-config.cmake.in @@ -22,7 +22,7 @@ #include <errno.h> #include <ctype.h> -#include "hiredis.h" +#include "hiredict.h" #include "net.h" #include "sds.h" #include "async.h" diff --git a/hiredis.pc.in b/hiredict.pc.in index c7b8e0e..c7b8e0e 100644 --- a/hiredis.pc.in +++ b/hiredict.pc.in diff --git a/hiredis.targets b/hiredict.targets index effd8a5..effd8a5 100644 --- a/hiredis.targets +++ b/hiredict.targets diff --git a/hiredis_ssl-config.cmake.in b/hiredict_ssl-config.cmake.in index eeb19d1..eeb19d1 100644 --- a/hiredis_ssl-config.cmake.in +++ b/hiredict_ssl-config.cmake.in diff --git a/hiredis_ssl.h b/hiredict_ssl.h index 43f072a..43f072a 100644 --- a/hiredis_ssl.h +++ b/hiredict_ssl.h diff --git a/hiredis_ssl.pc.in b/hiredict_ssl.pc.in index f7bdd99..f7bdd99 100644 --- a/hiredis_ssl.pc.in +++ b/hiredict_ssl.pc.in @@ -19,7 +19,7 @@ #ifndef __NET_H #define __NET_H -#include "hiredis.h" +#include "hiredict.h" void redisNetClose(redisContext *c); ssize_t redisNetRead(redisContext *c, char *buf, size_t bufcap); @@ -13,7 +13,7 @@ * */ -#include "hiredis.h" +#include "hiredict.h" #include "async.h" #include "net.h" @@ -24,7 +24,7 @@ #include <limits.h> #include <math.h> -#include "hiredis.h" +#include "hiredict.h" #include "async.h" #include "adapters/poll.h" #ifdef HIREDIS_TEST_SSL |