Browse Source

Rename arraylist -> json_c_arraylist

This done for the same reasons as we do not ship config.h.
pull/585/head
Björn Esser 5 years ago
parent
commit
3644f434cd
6 changed files with 10 additions and 10 deletions
  1. +2
    -2
      CMakeLists.txt
  2. +1
    -1
      json.h
  3. +2
    -2
      json_c_arraylist.c
  4. +3
    -3
      json_c_arraylist.h
  5. +1
    -1
      json_object.c
  6. +1
    -1
      json_tokener.c

+ 2
- 2
CMakeLists.txt View File

@@ -302,7 +302,7 @@ set(JSON_C_PUBLIC_HEADERS
${PROJECT_BINARY_DIR}/json_config.h

${PROJECT_SOURCE_DIR}/json.h
${PROJECT_SOURCE_DIR}/arraylist.h
${PROJECT_SOURCE_DIR}/json_c_arraylist.h
${PROJECT_SOURCE_DIR}/debug.h
${PROJECT_SOURCE_DIR}/json_c_version.h
${PROJECT_SOURCE_DIR}/json_inttypes.h
@@ -331,7 +331,7 @@ set(JSON_C_HEADERS
)

set(JSON_C_SOURCES
${PROJECT_SOURCE_DIR}/arraylist.c
${PROJECT_SOURCE_DIR}/json_c_arraylist.c
${PROJECT_SOURCE_DIR}/debug.c
${PROJECT_SOURCE_DIR}/json_c_version.c
${PROJECT_SOURCE_DIR}/json_object.c


+ 1
- 1
json.h View File

@@ -21,7 +21,7 @@
extern "C" {
#endif

#include "arraylist.h"
#include "json_c_arraylist.h"
#include "debug.h"
#include "json_c_version.h"
#include "json_object.h"


arraylist.c → json_c_arraylist.c View File

@@ -1,5 +1,5 @@
/*
* $Id: arraylist.c,v 1.4 2006/01/26 02:16:28 mclark Exp $
* $Id: json_c_arraylist.c,v 1.4 2006/01/26 02:16:28 mclark Exp $
*
* Copyright (c) 2004, 2005 Metaparadigm Pte. Ltd.
* Michael Clark <michael@metaparadigm.com>
@@ -34,7 +34,7 @@
#endif
#endif

#include "arraylist.h"
#include "json_c_arraylist.h"

struct array_list *array_list_new(array_list_free_fn *free_fn)
{

arraylist.h → json_c_arraylist.h View File

@@ -1,5 +1,5 @@
/*
* $Id: arraylist.h,v 1.4 2006/01/26 02:16:28 mclark Exp $
* $Id: json_c_arraylist.h,v 1.4 2006/01/26 02:16:28 mclark Exp $
*
* Copyright (c) 2004, 2005 Metaparadigm Pte. Ltd.
* Michael Clark <michael@metaparadigm.com>
@@ -15,8 +15,8 @@
* Although this is exposed by the json_object_get_array() method,
* it is not recommended for direct use.
*/
#ifndef _arraylist_h_
#define _arraylist_h_
#ifndef _json_c_arraylist_h_
#define _json_c_arraylist_h_

#ifdef __cplusplus
extern "C" {

+ 1
- 1
json_object.c View File

@@ -22,7 +22,7 @@
#include <stdlib.h>
#include <string.h>

#include "arraylist.h"
#include "json_c_arraylist.h"
#include "debug.h"
#include "json_inttypes.h"
#include "json_object.h"


+ 1
- 1
json_tokener.c View File

@@ -25,7 +25,7 @@
#include <stdlib.h>
#include <string.h>

#include "arraylist.h"
#include "json_c_arraylist.h"
#include "debug.h"
#include "json_inttypes.h"
#include "json_object.h"


Loading…
Cancel
Save