Merge branch 'da/include-compat-util-first-in-c'

Code clean-up.

* da/include-compat-util-first-in-c:
  cleanups: ensure that git-compat-util.h is included first
This commit is contained in:
Junio C Hamano 2014-10-14 10:49:00 -07:00
commit 211836f77b
9 changed files with 7 additions and 8 deletions

View File

@ -1,6 +1,7 @@
/* /*
* Copyright (c) 2011, Google Inc. * Copyright (c) 2011, Google Inc.
*/ */
#include "cache.h"
#include "bulk-checkin.h" #include "bulk-checkin.h"
#include "csum-file.h" #include "csum-file.h"
#include "pack.h" #include "pack.h"

View File

@ -4,8 +4,6 @@
#ifndef BULK_CHECKIN_H #ifndef BULK_CHECKIN_H
#define BULK_CHECKIN_H #define BULK_CHECKIN_H
#include "cache.h"
extern int index_bulk_checkin(unsigned char sha1[], extern int index_bulk_checkin(unsigned char sha1[],
int fd, size_t size, enum object_type type, int fd, size_t size, enum object_type type,
const char *path, unsigned flags); const char *path, unsigned flags);

1
http.c
View File

@ -1,3 +1,4 @@
#include "git-compat-util.h"
#include "http.h" #include "http.h"
#include "pack.h" #include "pack.h"
#include "sideband.h" #include "sideband.h"

View File

@ -3,8 +3,8 @@
* Fredrik Kuivinen. * Fredrik Kuivinen.
* The thieves were Alex Riesen and Johannes Schindelin, in June/July 2006 * The thieves were Alex Riesen and Johannes Schindelin, in June/July 2006
*/ */
#include "advice.h"
#include "cache.h" #include "cache.h"
#include "advice.h"
#include "cache-tree.h" #include "cache-tree.h"
#include "commit.h" #include "commit.h"
#include "blob.h" #include "blob.h"

View File

@ -1,5 +1,5 @@
#include "sigchain.h"
#include "cache.h" #include "cache.h"
#include "sigchain.h"
#define SIGCHAIN_MAX_SIGNALS 32 #define SIGCHAIN_MAX_SIGNALS 32

View File

@ -1,4 +1,4 @@
#include <git-compat-util.h> #include "git-compat-util.h"
int main(int argc, char **argv) int main(int argc, char **argv)
{ {

View File

@ -1,5 +1,5 @@
#include "sigchain.h"
#include "cache.h" #include "cache.h"
#include "sigchain.h"
#define X(f) \ #define X(f) \
static void f(int sig) { \ static void f(int sig) { \

View File

@ -1,3 +1,4 @@
#include "git-compat-util.h"
#include "varint.h" #include "varint.h"
uintmax_t decode_varint(const unsigned char **bufp) uintmax_t decode_varint(const unsigned char **bufp)

View File

@ -1,8 +1,6 @@
#ifndef VARINT_H #ifndef VARINT_H
#define VARINT_H #define VARINT_H
#include "git-compat-util.h"
extern int encode_varint(uintmax_t, unsigned char *); extern int encode_varint(uintmax_t, unsigned char *);
extern uintmax_t decode_varint(const unsigned char **); extern uintmax_t decode_varint(const unsigned char **);