From 4c15c4d2740d44d437648b17ef89a34b366bc654 Mon Sep 17 00:00:00 2001
From: jbj <devnull@localhost>
Date: Mon, 8 Oct 2001 14:48:22 +0000
Subject: Resolve conflicts.

CVS patchset: 5100
CVS date: 2001/10/08 14:48:22
---
 beecrypt/elgamal.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'beecrypt/elgamal.h')

diff --git a/beecrypt/elgamal.h b/beecrypt/elgamal.h
index 8af14163a..c990ab562 100644
--- a/beecrypt/elgamal.h
+++ b/beecrypt/elgamal.h
@@ -36,25 +36,25 @@ extern "C" {
 
 /**
  */
-BEEDLLAPI /*@unused@*/
+BEECRYPTAPI /*@unused@*/
 int elgv1sign(const mp32barrett* p, const mp32barrett* n, const mp32number* g, randomGeneratorContext*, const mp32number* hm, const mp32number* x, mp32number* r, mp32number* s)
 	/*@modifies r, s */;
 
 /**
  */
-BEEDLLAPI /*@unused@*/
+BEECRYPTAPI /*@unused@*/
 int elgv3sign(const mp32barrett* p, const mp32barrett* n, const mp32number* g, randomGeneratorContext*, const mp32number* hm, const mp32number* x, mp32number* r, mp32number* s)
 	/*@modifies r, s */;
 
 /**
  */
-BEEDLLAPI /*@unused@*/
+BEECRYPTAPI /*@unused@*/
 int elgv1vrfy(const mp32barrett* p, const mp32barrett* n, const mp32number* g, const mp32number* hm, const mp32number* y, const mp32number* r, const mp32number* s)
 	/*@*/;
 
 /**
  */
-BEEDLLAPI /*@unused@*/
+BEECRYPTAPI /*@unused@*/
 int elgv3vrfy(const mp32barrett* p, const mp32barrett* n, const mp32number* g, const mp32number* hm, const mp32number* y, const mp32number* r, const mp32number* s)
 	/*@*/;
 
-- 
cgit v1.2.3