Revert "union"

This reverts commit 20714489cf94f48a5ca7a9d58c44544d6811ca11.

1 files changed, 12 insertions, 19 deletions

diff --git a/internals.h b/internals.h
index 2568dbc..2b88b6f 100644
--- a/internals.h
+++ b/internals.h
@@ -147,25 +147,18 @@ struct BRANDT_Auction {
 	gcry_mpi_point_t **alpha;   /** alphas, size: n*k */
 	gcry_mpi_point_t **beta;    /** betas, size: n*k */
 
-        union {
-
-          struct {
-  	    gcry_mpi_point_t **gamma2;  /** gamma2, for public outcome, size: n*k */
-	    gcry_mpi_point_t **delta2;  /** delta2, for public outcome, size: n*k */
-	    gcry_mpi_point_t **phi2;    /** phi2, for public outcome, size: n*k */
-            /** proofs for the correctnes of the phi values, size: n*k */
-            struct proof_2dle ***phiproofs2;
-          };
-
-          struct {
-            gcry_mpi_point_t ***gamma3; /** gamma3, for private outcome, size: n*n*k */
-            gcry_mpi_point_t ***delta3; /** delta3, for private outcome, size: n*n*k */
-            gcry_mpi_point_t ***phi3;   /** phi3, for private outcome, size: n*n*k */
-
-            /** proofs for the correctnes of the phi values, size: n*n*k */
-            struct proof_2dle ***phiproofs3;
-          };
-        };
+	gcry_mpi_point_t **gamma2;  /** gamma2, for public outcome, size: n*k */
+	gcry_mpi_point_t ***gamma3; /** gamma3, for private outcome, size: n*n*k */
+	gcry_mpi_point_t **delta2;  /** delta2, for public outcome, size: n*k */
+	gcry_mpi_point_t ***delta3; /** delta3, for private outcome, size: n*n*k */
+	gcry_mpi_point_t **phi2;    /** phi2, for public outcome, size: n*k */
+	gcry_mpi_point_t ***phi3;   /** phi3, for private outcome, size: n*n*k */
+
+	/** proofs for the correctnes of the phi values, size: n*k */
+	struct proof_2dle ***phiproofs2;
+
+	/** proofs for the correctnes of the phi values, size: n*n*k */
+	struct proof_2dle ***phiproofs3;
 
 	gcry_mpi_point_t *tmpa1;    /** used for temporary storage, size: k */
 	gcry_mpi_point_t *tmpb1;    /** used for temporary storage, size: k */