Update copyright notices for 2011

[jansson.git] / src / jansson.h

diff --git a/src/jansson.h b/src/jansson.h
index 130dc95..fe2e1fb 100644 (file)
--- a/src/jansson.h
+++ b/src/jansson.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2010 Petri Lehtinen <petri@digip.org>
+ * Copyright (c) 2009-2011 Petri Lehtinen <petri@digip.org>
  *
  * Jansson is free software; you can redistribute it and/or modify
  * it under the terms of the MIT license. See LICENSE for details.
@@ -16,6 +16,22 @@
 extern "C" {
 #endif
 
+/* version */
+
+#define JANSSON_MAJOR_VERSION  1
+#define JANSSON_MINOR_VERSION  3
+#define JANSSON_MICRO_VERSION  0
+
+/* Micro version is omitted if it's 0 */
+#define JANSSON_VERSION  "1.3"
+
+/* Version as a 3-byte hex number, e.g. 0x010201 == 1.2.1. Use this
+   for numeric comparisons, e.g. #if JANSSON_VERSION_HEX >= ... */
+#define JANSSON_VERSION_HEX  ((JANSSON_MAJOR_VERSION << 16) |   \
+                              (JANSSON_MINOR_VERSION << 8)  |   \
+                              (JANSSON_MICRO_VERSION << 0)))
+
+
 /* types */
 
 typedef enum {
@@ -87,11 +103,14 @@ void json_decref(json_t *json)
 
 /* error reporting */
 
-#define JSON_ERROR_TEXT_LENGTH  160
+#define JSON_ERROR_TEXT_LENGTH    160
+#define JSON_ERROR_SOURCE_LENGTH   80
 
 typedef struct {
     char text[JSON_ERROR_TEXT_LENGTH];
     int line;
+    int column;
+    char source[JSON_ERROR_SOURCE_LENGTH];
 } json_error_t;