X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=pctb%2Fcommon.h;h=52f57d699c4cefd959d300bc44349038d7e4e5a8;hb=b1f4b728760aaa2cba8e19dca85b93d248f6db12;hp=3fa8a81d985621ad15277a461b7a5fb313b10398;hpb=6a3c0962283d32bc6e5f6c47c929baf37ddc642f;p=ypp-sc-tools.db-test.git

diff --git a/pctb/common.h b/pctb/common.h
index 3fa8a81..52f57d6 100644
--- a/pctb/common.h
+++ b/pctb/common.h
@@ -32,6 +32,7 @@
 
 #include <locale.h>
 #include <stdarg.h>
+#include <math.h>
 #include <stdio.h>
 #include <errno.h>
 #include <assert.h>
@@ -39,6 +40,8 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <dirent.h>
+#include <pcre.h>
 #include <inttypes.h>
 
 #include <sys/wait.h>
@@ -46,6 +49,7 @@
 
 typedef struct {
   int w,h;
+  struct RgbImage *rgb;
   char d[];
 } CanonImage;
 
@@ -74,6 +78,7 @@ typedef struct { /* both inclusive */
    DF(struct)					\
    DF(ocr)					\
    DF(rsync)					\
+   DF(structcolon)				\
    DF(callout)
 
 enum {
@@ -157,4 +162,11 @@ char *masprintf(const char *fmt, ...) FMT(1,2);
 	  "(Are you in the correct directory?)", helper);	\
   }while(0)
 
+
+#define ARRAYSIZE(a) ((sizeof((a)) / sizeof((a)[0])))
+#define FILLZERO(obj) (memset(&(obj),0,sizeof((obj))))
+
+#define STRING2(x) #x
+#define STRING(x) STRING2(x)
+
 #endif /*COMMON_H*/