merge work in progress

2012-11-26 15:10:25 +11:00
parent 9a1be5a80b
commit 49123234d0
6 changed files with 37 additions and 24 deletions
--- a/site_ansto/hardsup/modbustcp.c
+++ b/site_ansto/hardsup/modbustcp.c
@@ -21,7 +21,9 @@ Paul Barron, January 2008
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <rs232controller.h>
+#include "obdes.h"
+#include "conman.h"
+#include "rs232controller.h"
 #include "modbustcp.h"

 /*-------------------------------------------------------------------------*/