Undeprecate the array_list, lh_table and printbuf typedefs, but move each to the...

diff --git a/arraylist.h b/arraylist.h
index 2cac236d94a7a16a120f59635c1d481df1143b7b..38603e8aa57b308b396d5ce3c6675abd14a73c85 100644 (file)
--- a/arraylist.h
+++ b/arraylist.h
@@ -33,6 +33,7 @@ struct array_list
   size_t size;
   array_list_free_fn *free_fn;
 };
+typedef struct array_list array_list;
 
 extern struct array_list*
 array_list_new(array_list_free_fn *free_fn);

diff --git a/json_object.h b/json_object.h
index 9d79859af18b32c622b9e9e2fb99cd391b9499e4..283eb953008a4922d82d0f14d588cd5e56897996 100644 (file)
--- a/json_object.h
+++ b/json_object.h
@@ -35,6 +35,7 @@
 
 #include <stddef.h>
 #include "json_inttypes.h"
+#include "printbuf.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -145,21 +146,6 @@ struct json_object_iter
 };
 typedef struct json_object_iter json_object_iter;
 
-/* forward structure definitions */
-
-/**
- * @deprecated Unused in json-c sources
- */
-typedef struct printbuf printbuf;
-/**
- * @deprecated Unused in json-c sources
- */
-typedef struct lh_table lh_table;
-/**
- * @deprecated Unused in json-c sources
- */
-typedef struct array_list array_list;
-
 typedef int json_bool;
 
 /**

diff --git a/linkhash.h b/linkhash.h
index 3c609b6d19c5e2f66222250f13952d4415ea3e87..9c2f5c1b2581a63a48c58f20bcc604e62153659f 100644 (file)
--- a/linkhash.h
+++ b/linkhash.h
@@ -139,6 +139,7 @@ struct lh_table {
        lh_hash_fn *hash_fn;
        lh_equal_fn *equal_fn;
 };
+typedef struct lh_table lh_table;
 
 
 /**

diff --git a/printbuf.h b/printbuf.h
index 399cb072d7cbd27f8100d20a6c63eaeeaedcd0fc..567a6a08bb2d83d737d5487337d03de62f74b14b 100644 (file)
--- a/printbuf.h
+++ b/printbuf.h
@@ -32,6 +32,7 @@ struct printbuf {
   int bpos;
   int size;
 };
+typedef struct printbuf printbuf;
 
 extern struct printbuf*
 printbuf_new(void);