[Cmake-commits] [cmake-commits] david.cole committed archive_hash.h 1.1 1.2

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Utilities/cmlibarchive/libarchive
In directory public:/mounts/ram/cvs-serv18621/Utilities/cmlibarchive/libarchive

Modified Files:
	archive_hash.h 
Log Message:
Fix compile issues on Mac OSX 10.3 on midworld dashboard.


Index: archive_hash.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cmlibarchive/libarchive/archive_hash.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** archive_hash.h	30 Oct 2009 17:09:56 -0000	1.1
--- archive_hash.h	30 Oct 2009 20:22:08 -0000	1.2
***************
*** 109,113 ****
  #  define archive_sha256_final(ctx, buf)    SHA256Final(buf, ctx)
  #  define archive_sha256_update(ctx, buf, n)    SHA256Update(ctx, buf, n)
! #elif defined(HAVE_OPENSSL_SHA_H)
  #  include <openssl/sha.h>
  #  define ARCHIVE_HAS_SHA256
--- 109,113 ----
  #  define archive_sha256_final(ctx, buf)    SHA256Final(buf, ctx)
  #  define archive_sha256_update(ctx, buf, n)    SHA256Update(ctx, buf, n)
! #elif defined(HAVE_OPENSSL_SHA_H) && defined(HAVE_SHA256_INIT)
  #  include <openssl/sha.h>
  #  define ARCHIVE_HAS_SHA256
***************
*** 132,136 ****
  #  define archive_sha384_final(ctx, buf)    SHA384Final(buf, ctx)
  #  define archive_sha384_update(ctx, buf, n)    SHA384Update(ctx, buf, n)
! #elif defined(HAVE_OPENSSL_SHA_H)
  #  include <openssl/sha.h>
  #  define ARCHIVE_HAS_SHA384
--- 132,136 ----
  #  define archive_sha384_final(ctx, buf)    SHA384Final(buf, ctx)
  #  define archive_sha384_update(ctx, buf, n)    SHA384Update(ctx, buf, n)
! #elif defined(HAVE_OPENSSL_SHA_H) && defined(HAVE_SHA384_INIT)
  #  include <openssl/sha.h>
  #  define ARCHIVE_HAS_SHA384
***************
*** 155,159 ****
  #  define archive_sha512_final(ctx, buf)    SHA512Final(buf, ctx)
  #  define archive_sha512_update(ctx, buf, n)    SHA512Update(ctx, buf, n)
! #elif defined(HAVE_OPENSSL_SHA_H)
  #  include <openssl/sha.h>
  #  define ARCHIVE_HAS_SHA512
--- 155,159 ----
  #  define archive_sha512_final(ctx, buf)    SHA512Final(buf, ctx)
  #  define archive_sha512_update(ctx, buf, n)    SHA512Update(ctx, buf, n)
! #elif defined(HAVE_OPENSSL_SHA_H) && defined(HAVE_SHA512_INIT)
  #  include <openssl/sha.h>
  #  define ARCHIVE_HAS_SHA512