File tree Expand file tree Collapse file tree 2 files changed +6
-6
lines changed
Expand file tree Collapse file tree 2 files changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -293,12 +293,12 @@ ENDIF()
293293
294294# Specify sha1 implementation
295295IF (WIN32 AND NOT MINGW AND NOT SHA1_TYPE STREQUAL "builtin" )
296- ADD_DEFINITIONS (-DWIN32_SHA1 )
296+ ADD_DEFINITIONS (-DGIT_SHA1_WIN32 )
297297 FILE (GLOB SRC_SHA1 src/hash/hash_win32.c)
298298ELSEIF (${CMAKE_SYSTEM_NAME} MATCHES "Darwin" )
299- ADD_DEFINITIONS (-DGIT_COMMON_CRYPTO )
299+ ADD_DEFINITIONS (-DGIT_SHA1_COMMON_CRYPTO )
300300ELSEIF (OPENSSL_FOUND AND NOT SHA1_TYPE STREQUAL "builtin" )
301- ADD_DEFINITIONS (-DOPENSSL_SHA1 )
301+ ADD_DEFINITIONS (-DGIT_SHA1_OPENSSL )
302302 IF (CMAKE_SYSTEM_NAME MATCHES "FreeBSD" )
303303 LIST (APPEND LIBGIT2_PC_LIBS "-lssl" )
304304 ELSE ()
Original file line number Diff line number Diff line change @@ -16,11 +16,11 @@ int git_hash_global_init(void);
1616int git_hash_ctx_init (git_hash_ctx * ctx );
1717void git_hash_ctx_cleanup (git_hash_ctx * ctx );
1818
19- #if defined(GIT_COMMON_CRYPTO )
19+ #if defined(GIT_SHA1_COMMON_CRYPTO )
2020# include "hash/hash_common_crypto.h"
21- #elif defined(OPENSSL_SHA1 )
21+ #elif defined(GIT_SHA1_OPENSSL )
2222# include "hash/hash_openssl.h"
23- #elif defined(WIN32_SHA1 )
23+ #elif defined(GIT_SHA1_WIN32 )
2424# include "hash/hash_win32.h"
2525#else
2626# include "hash/hash_generic.h"
You can’t perform that action at this time.
0 commit comments