Commit b3039bee by Shawn O. Pearce

Cleanup formatting in our head files to be more consistent

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
parent 213e720c
#ifndef INCLUDE_commit_h__ #ifndef INCLUDE_commit_h__
#define INCLUDE_commit_h__ #define INCLUDE_commit_h__
#include "git/commit.h" #include "git/commit.h"
#include <time.h> #include <time.h>
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include "cc-compat.h" #include "cc-compat.h"
#include "util.h" #include "util.h"
#include "errors.h" #include "errors.h"
#include <assert.h> #include <assert.h>
#include <errno.h> #include <errno.h>
#include <stdlib.h> #include <stdlib.h>
......
#ifndef INCLUDE_errors_h__ #ifndef INCLUDE_errors_h__
#define INCLUDE_errors_h__ #define INCLUDE_errors_h__
#include "git/errors.h" #include "git/errors.h"
#include <stdlib.h> #include <stdlib.h>
...@@ -15,4 +16,5 @@ GIT_INLINE(void) *git_ptr_error(int code) ...@@ -15,4 +16,5 @@ GIT_INLINE(void) *git_ptr_error(int code)
git_errno = code; git_errno = code;
return NULL; return NULL;
} }
#endif #endif
#ifndef INCLUDE_git_errors_h__ #ifndef INCLUDE_git_errors_h__
#define INCLUDE_git_errors_h__ #define INCLUDE_git_errors_h__
#include "common.h"
#include "thread-utils.h"
/** /**
* @file git/errors.h * @file git/errors.h
* @brief Git error handling routines and variables * @brief Git error handling routines and variables
* @ingroup Git * @ingroup Git
* @{ * @{
*/ */
#include "common.h"
#include "thread-utils.h"
GIT_BEGIN_DECL GIT_BEGIN_DECL
/** The git errno. */ /** The git errno. */
...@@ -20,6 +21,7 @@ GIT_EXTERN(int) GIT_TLS git_errno; ...@@ -20,6 +21,7 @@ GIT_EXTERN(int) GIT_TLS git_errno;
* @return a string explaining the error code * @return a string explaining the error code
*/ */
GIT_EXTERN(const char *) git_strerror(int num); GIT_EXTERN(const char *) git_strerror(int num);
/** @} */ /** @} */
GIT_END_DECL GIT_END_DECL
#endif #endif
#ifndef INCLUDE_git_fileops_h__ #ifndef INCLUDE_git_fileops_h__
#define INCLUDE_git_fileops_h__ #define INCLUDE_git_fileops_h__
#include "common.h"
/** /**
* @file git/fileops.h * @file git/fileops.h
* @brief Git platform agnostic filesystem operations * @brief Git platform agnostic filesystem operations
...@@ -8,9 +10,8 @@ ...@@ -8,9 +10,8 @@
* @ingroup Git * @ingroup Git
* @{ * @{
*/ */
#include "common.h"
GIT_BEGIN_DECL GIT_BEGIN_DECL
/** /**
* For each directory entry (except "." and ".."), run the function * For each directory entry (except "." and ".."), run the function
* "fn", passing it "arg" as its first argument and the path to * "fn", passing it "arg" as its first argument and the path to
......
#ifndef INCLUDE_git_thread_utils_h__ #ifndef INCLUDE_git_thread_utils_h__
#define INCLUDE_git_thread_utils_h__ #define INCLUDE_git_thread_utils_h__
/* /*
* How TLS works is compiler+platform dependant * How TLS works is compiler+platform dependant
* Sources: http://en.wikipedia.org/wiki/Thread-Specific_Storage * Sources: http://en.wikipedia.org/wiki/Thread-Specific_Storage
* http://predef.sourceforge.net/precomp.html * http://predef.sourceforge.net/precomp.html
*/ */
#define GIT_HAS_TLS 1 #define GIT_HAS_TLS 1
#if defined(__GNUC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) || \ #if defined(__GNUC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) || \
defined(__xlc__) || defined(__xlC__) defined(__xlc__) || defined(__xlC__)
# define GIT_TLS __thread # define GIT_TLS __thread
#elif defined(__INTEL_COMPILER) #elif defined(__INTEL_COMPILER)
# if defined(_WIN32) || defined(_WIN32_CE) # if defined(_WIN32) || defined(_WIN32_CE)
# define GIT_TLS __declspec(thread) # define GIT_TLS __declspec(thread)
# else # else
# define GIT_TLS __thread # define GIT_TLS __thread
# endif # endif
#elif defined(_WIN32) || defined(_WIN32_CE) || defined(__BORLANDC__) #elif defined(_WIN32) || defined(_WIN32_CE) || defined(__BORLANDC__)
# define GIT_TLS __declspec(thread) # define GIT_TLS __declspec(thread)
#else #else
# undef GIT_HAS_TLS # undef GIT_HAS_TLS
# define GIT_TLS /* nothing: tls vars are thread-global */ # define GIT_TLS /* nothing: tls vars are thread-global */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment