From 5ff5e6589e2b702516cb11c37e91ed69ad4eae8a Mon Sep 17 00:00:00 2001
From: mdw <mdw>
Date: Mon, 10 Nov 2003 22:18:30 +0000
Subject: [PATCH] Build fixes.

---
 Makefile.m4 |  9 ++++++---
 buf.c       |  8 +++++---
 buf.h       | 16 +++++++++++-----
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/Makefile.m4 b/Makefile.m4
index c0b3ba3..1be844e 100644
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -1,6 +1,6 @@
 ## -*-m4-*-
 ##
-## $Id: Makefile.m4,v 1.63 2003/10/17 16:30:46 mdw Exp $
+## $Id: Makefile.m4,v 1.64 2003/11/10 22:18:30 mdw Exp $
 ##
 ## Makefile for Catacomb
 ##
@@ -29,6 +29,9 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.m4,v $
+## Revision 1.64  2003/11/10 22:18:30  mdw
+## Build fixes.
+##
 ## Revision 1.63  2003/10/17 16:30:46  mdw
 ## Report errors if key files don't exist!
 ##
@@ -344,7 +347,7 @@ define(`MP_SOURCES',
 	exp.c mpcrt.c mpmul.c mprand.c \
 	mpbarrett.c mpbarrett-mexp.c mpbarrett-exp.h \
 	mpmont.c mpmont-mexp.c mpmont-exp.h \
-	rho.c \
+	rho.c buf.c \
 	GF_SOURCES PGEN_SOURCES')
 
 define(`GF_SOURCES',
@@ -367,7 +370,7 @@ define(`PGEN_SOURCES',
 libcatacomb_la_SOURCES = \
 	grand.c keysz.c \
 	lcrand.c fibrand.c rc4.c seal.c rand.c noise.c fipstest.c maurer.c \
-	arena.c buf.c \
+	arena.c \
 	passphrase.c pixie-client.c pixie-common.c lmem.c \
 	oaep.c pkcs1.c pss.c tlsprf.c sslprf.c \
 	gfshare.c \
diff --git a/buf.c b/buf.c
index e03be65..5e0a069 100644
--- a/buf.c
+++ b/buf.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: buf.c,v 1.1 2003/10/11 21:02:33 mdw Exp $
+ * $Id: buf.c,v 1.2 2003/11/10 22:18:30 mdw Exp $
  *
  * Buffer handling
  *
@@ -30,6 +30,9 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: buf.c,v $
+ * Revision 1.2  2003/11/10 22:18:30  mdw
+ * Build fixes.
+ *
  * Revision 1.1  2003/10/11 21:02:33  mdw
  * Import buf stuff from tripe.
  *
@@ -52,8 +55,7 @@
 
 #include <string.h>
 
-#include <catacomb/mp.h>
-
+#include "mp.h"
 #include "buf.h"
 
 /*----- Main code ---------------------------------------------------------*/
diff --git a/buf.h b/buf.h
index ae5d993..0131681 100644
--- a/buf.h
+++ b/buf.h
@@ -1,8 +1,9 @@
 /* -*-c-*-
  *
- * $Id: buf.h,v 1.1 2003/10/11 21:02:33 mdw Exp $
+ * $Id: buf.h,v 1.2 2003/11/10 22:18:30 mdw Exp $
+ *
+ * Reading and writing packet buffers
  *
- * [Reading and writing packet buffers *
  * (c) 2001 Straylight/Edgeware
  */
 
@@ -29,6 +30,9 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: buf.h,v $
+ * Revision 1.2  2003/11/10 22:18:30  mdw
+ * Build fixes.
+ *
  * Revision 1.1  2003/10/11 21:02:33  mdw
  * Import buf stuff from tripe.
  *
@@ -37,8 +41,8 @@
  *
  */
 
-#ifndef BUF_H
-#define BUF_H
+#ifndef CATACOMB_BUF_H
+#define CATACOMB_BUF_H
 
 #ifdef __cplusplus
   extern "C" {
@@ -50,7 +54,9 @@
 
 #include <mLib/bits.h>
 
-#include <catacomb/mp.h>
+#ifndef CATACOMB_MP_H
+#  include "mp.h"
+#endif
 
 /*----- Data structures ---------------------------------------------------*/
 
-- 
2.11.0