From: Robert Kessl <kesslr@centrum.cz>
Date: Mon, 21 Jul 2014 10:40:57 +0000 (+0200)
Subject: Merge branch 'master' into dev-table
X-Git-Tag: v6.1~3^2~75
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=9160b9f6e7a235113bbe95364d0fc1a4ad247186;p=libucw.git

Merge branch 'master' into dev-table

Conflicts:
	ucw/table.h
---

9160b9f6e7a235113bbe95364d0fc1a4ad247186
diff --cc ucw/table.h
index 6b3f3765,e99961c1..be459687
--- a/ucw/table.h
+++ b/ucw/table.h
@@@ -7,11 -7,11 +7,13 @@@
  #ifndef _UCW_TABLE_H
  #define _UCW_TABLE_H
  
+ #include <inttypes.h>
+ 
  #include <ucw/fastbuf.h>
  #include <ucw/mempool.h>
 +#include <ucw/xtypes.h>
  
 +// FIXME: update these macros
  #ifdef CONFIG_UCW_CLEAN_ABI
  #define table_append_bool ucw_table_append_bool
  #define table_append_double ucw_table_append_double