ofproto: Inline trivial functions.

[sliver-openvswitch.git] / lib / json.h

diff --git a/lib/json.h b/lib/json.h
index 6aa9c49..cfe9457 100644 (file)
--- a/lib/json.h
+++ b/lib/json.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 Nicira Networks.
+ * Copyright (c) 2009, 2010 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,6 +32,12 @@
 
 #include "shash.h"
 
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+struct ds;
+
 /* Type of a JSON value. */
 enum json_type {
     JSON_NULL,                  /* null */
@@ -120,9 +126,14 @@ enum {
     JSSF_SORT = 1 << 1          /* Object members in sorted order, if true. */
 };
 char *json_to_string(const struct json *, int flags);
+void json_to_ds(const struct json *, int flags, struct ds *);
 \f
 /* JSON string formatting operations. */
 
 bool json_string_unescape(const char *in, size_t in_len, char **outp);
 
+#ifdef  __cplusplus
+}
+#endif
+
 #endif /* json.h */