kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

KWSys 2014-04-07 (8b085635)

Browse Source 
Extract upstream KWSys using the following shell commands.

$ git archive --prefix=upstream-kwsys/ 8b085635 | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' 39f98b5d..8b085635
Rolf Eike Beer (2):
      a99a9235 set the compile flags for older HP compilers to fix compilation
      8b085635 MD5: avoid casting back and forth between size_t and int

Change-Id: I6386b521dbaba2e4f9ed5b2be34a504b9c17fc36
This commit is contained in:
KWSys Robot 2014-04-07 09:49:13 -04:00 committed by Brad King
parent eccc425af6
commit c54be58309
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -299,6 +299,13 @@ IF(NOT CMAKE_COMPILER_IS_GNUCXX)
ENDIF(CMAKE_SYSTEM MATCHES "OSF1-V.*") ENDIF(CMAKE_SYSTEM MATCHES "OSF1-V.*")
IF(CMAKE_SYSTEM MATCHES "HP-UX") IF(CMAKE_SYSTEM MATCHES "HP-UX")
SET(KWSYS_PLATFORM_CXX_TEST_EXTRA_FLAGS "+p") SET(KWSYS_PLATFORM_CXX_TEST_EXTRA_FLAGS "+p")
IF(CMAKE_CXX_COMPILER_ID MATCHES "HP")
# it is known that version 3.85 fails and 6.25 works without these flags
IF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4)
# use new C++ library and improved template support
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -AA +hpxstd98")
ENDIF()
ENDIF()
ENDIF(CMAKE_SYSTEM MATCHES "HP-UX") ENDIF(CMAKE_SYSTEM MATCHES "HP-UX")
ENDIF(NOT CMAKE_COMPILER_IS_GNUCXX) ENDIF(NOT CMAKE_COMPILER_IS_GNUCXX)

9
MD5.c
View File

@ -478,11 +478,16 @@ void kwsysMD5_Initialize(kwsysMD5* md5)
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/
void kwsysMD5_Append(kwsysMD5* md5, unsigned char const* data, int length) void kwsysMD5_Append(kwsysMD5* md5, unsigned char const* data, int length)
{ {
size_t dlen;
if(length < 0) if(length < 0)
{ {
length = (int)strlen((char const*)data); dlen = strlen((char const*)data);
} }
md5_append(&md5->md5_state, (md5_byte_t const*)data, (size_t)length); else
{
dlen = (size_t)length;
}
md5_append(&md5->md5_state, (md5_byte_t const*)data, dlen);
} }
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/