- Removed -fwritable-string

SKIPPED:
	psi/dornier2.c
	psi/ecbdriv.c
	psi/el734hp.c
	psi/libpsi.a
	psi/make_gen
	psi/makefile_linux
	psi/pimotor.c
	psi/pipiezo.c
	psi/sinqhttp.c
	psi/tcpdornier.c
	psi/velodornier.c

ubcalc.w

@@ -7,7 +7,7 @@ This module helps in the calculation of UB matrices for four
 
 @o ubcalc.h @{
 /*----------------------------------------------------------------------
-  UB caclualtion routines for four circle diffraction.
+  UB calculation routines for four circle diffraction.
   This is the interpreter interface to functionality implemented
   in fourlib.c
 
@@ -17,12 +17,29 @@ This module helps in the calculation of UB matrices for four
 -----------------------------------------------------------------------*/
 #ifndef SICSUBCALC
 #define SICSUBCALC
-
+#include "sics.h"
+#include "matrix/matrix.h"
+#include "cell.h"
+#include "hkl.h"
+#include "ubfour.h"
+/*---------------------------------------------------------------------*/
+typedef struct {
+  pObjectDescriptor pDes;
+  pHKL hkl;
+  lattice direct;
+  reflection r1, r2, r3;
+  MATRIX UB;
+  double allowedDeviation;
+  int indexSearchLimit;
+  int maxSuggestions;
+} UBCALC, *pUBCALC;
+/*-------------------------------------------------------------------*/
 int MakeUBCalc(SConnection *pCon,SicsInterp *pSics, void *pData,		
 		int argc, char *argv[]);
 int UBCalcWrapper(SConnection *pCon, SicsInterp *pSics, void *pData,		
 		int argc, char *argv[]);
-
+		
+reflection getReflection(void *ubcalc, int no);
 #endif   
 @}