Merge pull request #444 from carlosmn/fetch-fixes

[libgit2.git] / src / common.h

diff --git a/src/common.h b/src/common.h
index 18c321ca3c1f1d360c8f6c793cd48afeddb4b54e..f7a41d47e88cb20dd9548e59fa7e7292dae20108 100644 (file)
--- a/src/common.h
+++ b/src/common.h
@@ -1,22 +1,16 @@
+/*
+ * Copyright (C) 2009-2011 the libgit2 contributors
+ *
+ * This file is part of libgit2, distributed under the GNU GPL v2 with
+ * a Linking Exception. For full terms see the included COPYING file.
+ */
 #ifndef INCLUDE_common_h__
 #define INCLUDE_common_h__
 
-/** Force 64 bit off_t size on POSIX. */
-#define _FILE_OFFSET_BITS 64
-
-#if defined(_WIN32) && !defined(__CYGWIN__)
-#define GIT_WIN32 1
-#endif
-
-#include "git/thread-utils.h"
+#include "git2/common.h"
+#include "git2/thread-utils.h"
 #include "cc-compat.h"
 
-#ifdef GIT_HAS_PTHREAD
-# include <pthread.h>
-#endif
-#ifdef GIT_HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
 #include <assert.h>
 #include <errno.h>
 #include <limits.h>
@@ -32,25 +26,39 @@
 # include <io.h>
 # include <direct.h>
 # include <windows.h>
-# include "msvc-compat.h"
-# include "mingw-compat.h"
+# include "win32/msvc-compat.h"
+# include "win32/mingw-compat.h"
+# ifdef GIT_THREADS
+#      include "win32/pthread.h"
+#endif
 
 # define snprintf _snprintf
 
+#ifndef _SSIZE_T_DEFINED
 typedef SSIZE_T ssize_t;
+#endif
 
 #else
-
 # include <unistd.h>
-# include <arpa/inet.h>
 
+# ifdef GIT_THREADS
+#      include <pthread.h>
+# endif
 #endif
 
-#include "git/common.h"
-#include "util.h"
+#include "git2/types.h"
+#include "git2/errors.h"
 #include "thread-utils.h"
-#include "errors.h"
+#include "bswap.h"
 
-#define GIT_PATH_MAX 4096
+extern void git___throw(const char *, ...) GIT_FORMAT_PRINTF(1, 2);
+#define git__throw(error, ...) \
+       (git___throw(__VA_ARGS__), error)
+
+extern void git___rethrow(const char *, ...) GIT_FORMAT_PRINTF(1, 2);
+#define git__rethrow(error, ...) \
+       (git___rethrow(__VA_ARGS__), error)
+
+#include "util.h"
 
 #endif /* INCLUDE_common_h__ */