Expunge revision histories in files.

[u/mdw/catacomb] / limlee.h

diff --git a/limlee.h b/limlee.h
index bccfccb..9c7b357 100644 (file)
--- a/limlee.h
+++ b/limlee.h
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: limlee.h,v 1.2 2000/08/18 19:16:51 mdw Exp $
+ * $Id: limlee.h,v 1.5 2004/04/08 01:36:15 mdw Exp $
  *
  * Generate Lim-Lee primes
  *
@@ -27,17 +27,6 @@
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: limlee.h,v $
- * Revision 1.2  2000/08/18 19:16:51  mdw
- * New stepper interface for constructing Lim-Lee primes.
- *
- * Revision 1.1  2000/07/09 21:30:58  mdw
- * Lim-Lee prime generation.
- *
- */
-
 #ifndef CATACOMB_LIMLEE_H
 #define CATACOMB_LIMLEE_H
 
@@ -78,6 +67,7 @@ typedef struct limlee_stepctx {
   void *pc;                            /* Context ptr for generator ops */
   pgen_proc *iev;                      /* Event handler for inner @pgen@ */
   void *iec;                           /* Context for inner @pgen@ */
+  grand *r;                            /* Random number generator */
 
   /* --- Output values --- */
 
@@ -87,7 +77,6 @@ typedef struct limlee_stepctx {
   /* --- Maintained internally --- */
 
   octet *c;                            /* Combination byte-flag vector */
-  grand *r;                            /* Random number generator */
   unsigned long seq;                   /* Sequence number for primes */
   size_t poolsz;                       /* Size of the small-prime pool */
   dstr d;                              /* String for subprime name */
@@ -102,9 +91,7 @@ typedef struct limlee_primeops {
 
 /* --- Flags --- */
 
-enum {
-  LIMLEE_KEEPFACTORS = 1
-};
+#define LIMLEE_KEEPFACTORS 1u
 
 /*----- The Lim-Lee stepper function --------------------------------------*/