Merge pull request #2575 from cirosantilli/factor-struct-typedef

[factor] Join typedef and struct definitions in single file.

1 files changed, 4 insertions, 6 deletions

diff --git a/include/git2/diff.h b/include/git2/diff.h
index 8147fd31c..ca49a9cd9 100644
--- a/include/git2/diff.h
+++ b/include/git2/diff.h
@@ -421,15 +421,14 @@ typedef int (*git_diff_file_cb)(
 /**
  * Structure describing a hunk of a diff.
  */
-typedef struct git_diff_hunk git_diff_hunk;
-struct git_diff_hunk {
+typedef struct git_diff_hunk {
 	int    old_start;     /**< Starting line number in old_file */
 	int    old_lines;     /**< Number of lines in old_file */
 	int    new_start;     /**< Starting line number in new_file */
 	int    new_lines;     /**< Number of lines in new_file */
 	size_t header_len;    /**< Number of bytes in header text */
 	char   header[128];   /**< Header text, NUL-byte terminated */
-};
+} git_diff_hunk;
 
 /**
  * When iterating over a diff, callback that will be made per hunk.
@@ -469,8 +468,7 @@ typedef enum {
 /**
  * Structure describing a line (or data span) of a diff.
  */
-typedef struct git_diff_line git_diff_line;
-struct git_diff_line {
+typedef struct git_diff_line {
 	char   origin;       /**< A git_diff_line_t value */
 	int    old_lineno;   /**< Line number in old file or -1 for added line */
 	int    new_lineno;   /**< Line number in new file or -1 for deleted line */
@@ -478,7 +476,7 @@ struct git_diff_line {
 	size_t content_len;  /**< Number of bytes of data */
 	git_off_t content_offset; /**< Offset in the original file to the content */
 	const char *content; /**< Pointer to diff text, not NUL-byte terminated */
-};
+} git_diff_line;
 
 /**
  * When iterating over a diff, callback that will be made per text diff