chiark
/
gitweb
/
~yarrgweb
/
ypp-sc-tools.db-test.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Correct bugs in new AA table cell structure parsing
[ypp-sc-tools.db-test.git]
/
pctb
/
common.h
diff --git
a/pctb/common.h
b/pctb/common.h
index 3fa8a81d985621ad15277a461b7a5fb313b10398..d4464bdbefa4adf958d8619d5d2b63ef8c3ab88d 100644
(file)
--- a/
pctb/common.h
+++ b/
pctb/common.h
@@
-39,6
+39,8
@@
#include <stdint.h>
#include <stdlib.h>
#include <unistd.h>
#include <stdint.h>
#include <stdlib.h>
#include <unistd.h>
+#include <dirent.h>
+#include <pcre.h>
#include <inttypes.h>
#include <sys/wait.h>
#include <inttypes.h>
#include <sys/wait.h>
@@
-46,6
+48,7
@@
typedef struct {
int w,h;
typedef struct {
int w,h;
+ struct RgbImage *rgb;
char d[];
} CanonImage;
char d[];
} CanonImage;
@@
-74,6
+77,7
@@
typedef struct { /* both inclusive */
DF(struct) \
DF(ocr) \
DF(rsync) \
DF(struct) \
DF(ocr) \
DF(rsync) \
+ DF(structcolon) \
DF(callout)
enum {
DF(callout)
enum {
@@
-157,4
+161,8
@@
char *masprintf(const char *fmt, ...) FMT(1,2);
"(Are you in the correct directory?)", helper); \
}while(0)
"(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))))
+
#endif /*COMMON_H*/
#endif /*COMMON_H*/