Merge pull request #444 from carlosmn/fetch-fixes

[libgit2.git] / src / common.h

diff --git a/src/common.h b/src/common.h
index e1e7f0035866da12ca43f5bfb470f5800ce4042a..f7a41d47e88cb20dd9548e59fa7e7292dae20108 100644 (file)
--- a/src/common.h
+++ b/src/common.h
@@ -1,3 +1,9 @@
+/*
+ * 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__
 
@@ -5,9 +11,6 @@
 #include "git2/thread-utils.h"
 #include "cc-compat.h"
 
-#ifdef GIT_HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
 #include <assert.h>
 #include <errno.h>
 #include <limits.h>
@@ -26,18 +29,20 @@
 # include "win32/msvc-compat.h"
 # include "win32/mingw-compat.h"
 # ifdef GIT_THREADS
-#  include "win32/pthread.h"
+#      include "win32/pthread.h"
 #endif
 
 # define snprintf _snprintf
 
+#ifndef _SSIZE_T_DEFINED
 typedef SSIZE_T ssize_t;
+#endif
 
 #else
 # include <unistd.h>
 
 # ifdef GIT_THREADS
-#  include <pthread.h>
+#      include <pthread.h>
 # endif
 #endif
 
@@ -46,8 +51,13 @@ typedef SSIZE_T ssize_t;
 #include "thread-utils.h"
 #include "bswap.h"
 
-extern int git__throw(int error, const char *, ...) GIT_FORMAT_PRINTF(2, 3);
-extern int git__rethrow(int error, const char *, ...) GIT_FORMAT_PRINTF(2, 3);
+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"