[66447] trunk/base/src/pextlib1.0

[jmr at macports.org]

Revision: 66447
          http://trac.macports.org/changeset/66447
Author:   jmr at macports.org
Date:     2010-04-13 12:21:26 -0700 (Tue, 13 Apr 2010)
Log Message:
-----------
fix build with libmd

Modified Paths:
--------------
    trunk/base/src/pextlib1.0/rmd160cmd.c
    trunk/base/src/pextlib1.0/sha1cmd.c

Modified: trunk/base/src/pextlib1.0/rmd160cmd.c
===================================================================
--- trunk/base/src/pextlib1.0/rmd160cmd.c	2010-04-13 19:15:26 UTC (rev 66446)
+++ trunk/base/src/pextlib1.0/rmd160cmd.c	2010-04-13 19:21:26 UTC (rev 66447)
@@ -40,7 +40,7 @@
 
 #include "rmd160cmd.h"
 
-#if HAVE_COMMONCRYPTO_COMMONDIGEST_H
+#if !defined(HAVE_LIBMD)
 
 /* We do not have libmd.
  * let's use our own version of rmd160* libraries.
@@ -60,12 +60,10 @@
 CHECKSUMEnd(RMD160, RMD160_CTX, RIPEMD160_DIGEST_LENGTH)
 CHECKSUMFile(RMD160, RMD160_CTX)
 
-#elif defined(HAVE_LIBMD)
-#include <sys/types.h>
-#include <ripemd.h>
-#define RMD160File(x, y) RIPEMD160_File(x, y)
 #else
-#error CommonCrypto or libmd required
+#include <sys/types.h>
+#include <rmd160.h>
+#define RIPEMD160_DIGEST_LENGTH (RIPEMD160_HASHBYTES)
 #endif
 
 int RMD160Cmd(ClientData clientData UNUSED, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])

Modified: trunk/base/src/pextlib1.0/sha1cmd.c
===================================================================
--- trunk/base/src/pextlib1.0/sha1cmd.c	2010-04-13 19:15:26 UTC (rev 66446)
+++ trunk/base/src/pextlib1.0/sha1cmd.c	2010-04-13 19:21:26 UTC (rev 66447)
@@ -57,6 +57,7 @@
 #elif defined(HAVE_LIBMD)
 #include <sys/types.h>
 #include <sha.h>
+#define SHA_DIGEST_LENGTH (SHA_HASHBYTES)
 #else
 #error CommonCrypto or libmd required
 #endif
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100413/642236fa/attachment.html>