proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-09 18:22:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

hash: rename implementation selection constants

Browse Source
This commit is contained in:
Edward Thomson 2017-02-24 13:03:15 +00:00
parent ba2bc4911d
commit a371a8ae94
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -293,12 +293,12 @@ ENDIF()
# Specify sha1 implementation # Specify sha1 implementation
IF (WIN32 AND NOT MINGW AND NOT SHA1_TYPE STREQUAL "builtin") IF (WIN32 AND NOT MINGW AND NOT SHA1_TYPE STREQUAL "builtin")
ADD_DEFINITIONS(-DWIN32_SHA1) ADD_DEFINITIONS(-DGIT_SHA1_WIN32)
FILE(GLOB SRC_SHA1 src/hash/hash_win32.c) FILE(GLOB SRC_SHA1 src/hash/hash_win32.c)
ELSEIF (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") ELSEIF (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
ADD_DEFINITIONS(-DGIT_COMMON_CRYPTO) ADD_DEFINITIONS(-DGIT_SHA1_COMMON_CRYPTO)
ELSEIF (OPENSSL_FOUND AND NOT SHA1_TYPE STREQUAL "builtin") ELSEIF (OPENSSL_FOUND AND NOT SHA1_TYPE STREQUAL "builtin")
ADD_DEFINITIONS(-DOPENSSL_SHA1) ADD_DEFINITIONS(-DGIT_SHA1_OPENSSL)
IF (CMAKE_SYSTEM_NAME MATCHES "FreeBSD") IF (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
LIST(APPEND LIBGIT2_PC_LIBS "-lssl") LIST(APPEND LIBGIT2_PC_LIBS "-lssl")
ELSE() ELSE()

6
src/hash.h
View File

@ -16,11 +16,11 @@ int git_hash_global_init(void);
int git_hash_ctx_init(git_hash_ctx *ctx); int git_hash_ctx_init(git_hash_ctx *ctx);
void git_hash_ctx_cleanup(git_hash_ctx *ctx); void git_hash_ctx_cleanup(git_hash_ctx *ctx);
#if defined(GIT_COMMON_CRYPTO) #if defined(GIT_SHA1_COMMON_CRYPTO)
# include "hash/hash_common_crypto.h" # include "hash/hash_common_crypto.h"
#elif defined(OPENSSL_SHA1) #elif defined(GIT_SHA1_OPENSSL)
# include "hash/hash_openssl.h" # include "hash/hash_openssl.h"
#elif defined(WIN32_SHA1) #elif defined(GIT_SHA1_WIN32)
# include "hash/hash_win32.h" # include "hash/hash_win32.h"
#else #else
# include "hash/hash_generic.h" # include "hash/hash_generic.h"