From 6d7bb4e039f6f6cf4e8542024550840a4ba50624 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn=20Nieto?= Date: Tue, 29 Mar 2011 17:35:02 +0200 Subject: [PATCH] Move git_cvar_type to include/git2/config.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Include it in src/config.h and fix the header name #define. Signed-off-by: Carlos Martín Nieto --- include/git2/types.h | 7 +++++++ src/config.h | 12 ++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/include/git2/types.h b/include/git2/types.h index aa53909d2..269c48249 100644 --- a/include/git2/types.h +++ b/include/git2/types.h @@ -153,6 +153,13 @@ typedef enum { GIT_REF_HAS_PEEL = 8, } git_rtype; +/** Config variable type */ +typedef enum { + GIT_VAR_INT, /** Stores an integer value */ + GIT_VAR_BOOL, /** Stores a boolean value */ + GIT_VAR_STR /** Stores a string */ +} git_cvar_type; + /** @} */ GIT_END_DECL diff --git a/src/config.h b/src/config.h index 2aa9ec804..3b9da5241 100644 --- a/src/config.h +++ b/src/config.h @@ -1,5 +1,7 @@ -#ifndef INCLUDE_tag_h__ -#define INCLUDE_tag_h__ +#ifndef INCLUDE_config_h__ +#define INCLUDE_config_h__ + +#include "git2/config.h" struct git_config { char *file_path; @@ -14,12 +16,6 @@ struct git_config { git_hashtable *vars; }; -typedef enum { - GIT_VAR_INT, - GIT_VAR_BOOL, - GIT_VAR_STR -} git_cvar_type; - struct git_cvar { git_cvar_type type; char *name;