Brought forward from 0.9.8 - 64 bit warning fixes and fussy compiler fixes.

[openssl.git] / crypto / pqueue / pq_compat.h

diff --git a/crypto/pqueue/pq_compat.h b/crypto/pqueue/pq_compat.h
index 776760a35a23f88f3b7b412f7350fea0c65b036a..904b0d09a2d5c2a93a958ff5d30d0ecf2ba18e5a 100644 (file)
--- a/crypto/pqueue/pq_compat.h
+++ b/crypto/pqueue/pq_compat.h
@@ -1,3 +1,4 @@
+#error "to be deleted"

 /* crypto/pqueue/pqueue_compat.h */
 /* 
  * DTLS implementation written by Nagendra Modadugu
 /* crypto/pqueue/pqueue_compat.h */
 /* 
  * DTLS implementation written by Nagendra Modadugu


@@ -74,6 +75,9 @@
 
 #if (defined(THIRTY_TWO_BIT) && !defined(BN_LLONG)) || defined(SIXTEEN_BIT) || defined(EIGHT_BIT)
 
 
 #if (defined(THIRTY_TWO_BIT) && !defined(BN_LLONG)) || defined(SIXTEEN_BIT) || defined(EIGHT_BIT)
 

+#define PQ_64BIT_IS_INTEGER 0
+#define PQ_64BIT_IS_BIGNUM 1
+

 #define PQ_64BIT     BIGNUM
 #define PQ_64BIT_CTX BN_CTX
 
 #define PQ_64BIT     BIGNUM
 #define PQ_64BIT_CTX BN_CTX
 


@@ -102,10 +106,15 @@
 
 #else
 
 
 #else
 

+#define PQ_64BIT_IS_INTEGER 1
+#define PQ_64BIT_IS_BIGNUM 0
+

 #if defined(SIXTY_FOUR_BIT) || defined(SIXTY_FOUR_BIT_LONG)
 #define PQ_64BIT BN_ULONG
 #if defined(SIXTY_FOUR_BIT) || defined(SIXTY_FOUR_BIT_LONG)
 #define PQ_64BIT BN_ULONG

+#define PQ_64BIT_PRINT "%ld"

 #elif defined(THIRTY_TWO_BIT)
 #define PQ_64BIT BN_ULLONG
 #elif defined(THIRTY_TWO_BIT)
 #define PQ_64BIT BN_ULLONG

+#define PQ_64BIT_PRINT "%lld"

 #endif
 
 #define PQ_64BIT_CTX      void
 #endif
 
 #define PQ_64BIT_CTX      void