diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2019-01-19 01:36:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-19 01:36:40 +0000 |
| commit | b2c2dc643b2bd3d440a25a2ce3d64427dc28d4de (patch) | |
| tree | 771ce3175bd58276ae06a6908dd6d54a3a847f95 /include | |
| parent | c352e5617ac56feec258e9a094460aa4da6e00ec (diff) | |
| parent | 83151018ef0228b53739cbc2bc785a673752c349 (diff) | |
| download | libgit2-b2c2dc643b2bd3d440a25a2ce3d64427dc28d4de.tar.gz | |
Merge pull request #4940 from libgit2/ethomson/git_obj
More `git_obj` to `git_object` updates
Diffstat (limited to 'include')
| -rw-r--r-- | include/git2/types.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/include/git2/types.h b/include/git2/types.h index a9c286584..257c0371a 100644 --- a/include/git2/types.h +++ b/include/git2/types.h @@ -69,7 +69,7 @@ typedef int64_t git_time_t; /** Basic type (loose or packed) of any Git object. */ typedef enum { GIT_OBJECT_ANY = -2, /**< Object can be any of the following */ - GIT_OBJECT_BAD = -1, /**< Object is invalid. */ + GIT_OBJECT_INVALID = -1, /**< Object is invalid. */ GIT_OBJECT_COMMIT = 1, /**< A commit object. */ GIT_OBJECT_TREE = 2, /**< A tree (directory listing) object. */ GIT_OBJECT_BLOB = 3, /**< A file revision object. */ @@ -450,16 +450,16 @@ typedef struct git_mailmap git_mailmap; /**@{*/ -#define GIT_OBJ_ANY GIT_OBJECT_ANY -#define GIT_OBJ_BAD GIT_OBJECT_BAD -#define GIT_OBJ__EXT1 0 -#define GIT_OBJ_COMMIT GIT_OBJECT_COMMIT -#define GIT_OBJ_TREE GIT_OBJECT_TREE -#define GIT_OBJ_BLOB GIT_OBJECT_BLOB -#define GIT_OBJ_TAG GIT_OBJECT_TAG -#define GIT_OBJ__EXT2 5 -#define GIT_OBJ_OFS_DELTA GIT_OBJECT_OFS_DELTA -#define GIT_OBJ_REF_DELTA GIT_OBJECT_REF_DELTA +GIT_DEPRECATED(static const int) GIT_OBJ_ANY = GIT_OBJECT_ANY; +GIT_DEPRECATED(static const int) GIT_OBJ_BAD = GIT_OBJECT_INVALID; +GIT_DEPRECATED(static const int) GIT_OBJ__EXT1 = 0; +GIT_DEPRECATED(static const int) GIT_OBJ_COMMIT = GIT_OBJECT_COMMIT; +GIT_DEPRECATED(static const int) GIT_OBJ_TREE = GIT_OBJECT_TREE; +GIT_DEPRECATED(static const int) GIT_OBJ_BLOB = GIT_OBJECT_BLOB; +GIT_DEPRECATED(static const int) GIT_OBJ_TAG = GIT_OBJECT_TAG; +GIT_DEPRECATED(static const int) GIT_OBJ__EXT2 = 5; +GIT_DEPRECATED(static const int) GIT_OBJ_OFS_DELTA = GIT_OBJECT_OFS_DELTA; +GIT_DEPRECATED(static const int) GIT_OBJ_REF_DELTA = GIT_OBJECT_REF_DELTA; #define git_otype git_object_t |