Merge branch 'refs/heads/t/sha3' into master

[osl.git] / osl_core.h

diff --git a/osl_core.h b/osl_core.h
index 91489c95a3aa3b606652568c02ece75bc5158ffa..e98c33538bfff043b2ae94145e9dee2b836f28bc 100644 (file)
--- a/osl_core.h
+++ b/osl_core.h
@@ -201,7 +201,7 @@ _static_inline_ size_t index_column_description_size(const char *name)
  * The version used by this instance of the library. Written to the index of
  * newly created tables.
  */
-#define CURRENT_TABLE_VERSION 1
+#define CURRENT_TABLE_VERSION 3
 
 /*
  * The lowest table version this library understands. On open, if
@@ -363,8 +363,8 @@ _static_inline_ char *disk_storage_path(const struct osl_table *t,
  * \sa FOR_EACH_COLUMN_OF_TYPE, FOR_EACH_MAPPED_COLUMN, FOR_EACH_RBTREE_COLUMN,
  * FOR_EACH_DISK_STORAGE_COLUMN, FOR_EACH_VOLATILE_COLUMN, osl_storage_type.
  */
-_static_inline_ int next_column_of_type(enum osl_storage_type type, int col_num,
-               const struct osl_table *t,
+_static_inline_ unsigned next_column_of_type(enum osl_storage_type type,
+               unsigned col_num, const struct osl_table *t,
                const struct osl_column_description **cd)
 {
        *cd = NULL;