proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-24 07:03:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #357 from carlosmn/calling-convention

Browse Source 
Use __stdcall by default on Windows
This commit is contained in:
Vicent Martí 2011-08-08 11:10:16 -07:00
commit a41bf61222
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -45,10 +45,14 @@ SET(INSTALL_INC include CACHE PATH "Where to install headers to.")
OPTION (BUILD_SHARED_LIBS "Build Shared Library (OFF for Static)" ON) OPTION (BUILD_SHARED_LIBS "Build Shared Library (OFF for Static)" ON)
OPTION (BUILD_TESTS "Build Tests" ON) OPTION (BUILD_TESTS "Build Tests" ON)
OPTION (THREADSAFE "Build libgit2 as threadsafe" OFF) OPTION (THREADSAFE "Build libgit2 as threadsafe" OFF)
OPTION (STDCALL "Buildl libgit2 with the __stdcall convention (Windows)" ON)
# Platform specific compilation flags # Platform specific compilation flags
IF (MSVC) IF (MSVC)
SET(CMAKE_C_FLAGS "/W4 /WX /nologo /Zi") SET(CMAKE_C_FLAGS "/W4 /WX /nologo /Zi")
IF (STDCALL)
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Gz")
ENDIF ()
# TODO: bring back /RTC1 /RTCc # TODO: bring back /RTC1 /RTCc
SET(CMAKE_C_FLAGS_DEBUG "/Od /DEBUG /MTd") SET(CMAKE_C_FLAGS_DEBUG "/Od /DEBUG /MTd")
SET(CMAKE_C_FLAGS_RELEASE "/MT /O2") SET(CMAKE_C_FLAGS_RELEASE "/MT /O2")

10
src/transport_local.c
View File

@ -14,14 +14,6 @@ typedef struct {
git_vector *refs; git_vector *refs;
} transport_local; } transport_local;
static int cmp_refs(const void *a, const void *b)
{
const char *stra = *(const char * const *) a;
const char *strb = *(const char * const *) b;
return strcmp(stra, strb);
}
/* /*
* Try to open the url as a git directory. The direction doesn't * Try to open the url as a git directory. The direction doesn't
* matter in this case because we're calulating the heads ourselves. * matter in this case because we're calulating the heads ourselves.
@ -148,7 +140,7 @@ static int local_ls(git_transport *transport, git_headarray *array)
return error; return error;
/* Sort the references first */ /* Sort the references first */
qsort(refs.strings, refs.count, sizeof(char *), cmp_refs); git__tsort((void **)refs.strings, refs.count, (git_vector_cmp) strcmp);
/* Add HEAD */ /* Add HEAD */
error = add_ref(GIT_HEAD_FILE, repo, vec); error = add_ref(GIT_HEAD_FILE, repo, vec);

7
tests/test_main.c
View File

@ -69,7 +69,12 @@ static libgit2_suite suite_methods[]= {
#define GIT_SUITE_COUNT (ARRAY_SIZE(suite_methods)) #define GIT_SUITE_COUNT (ARRAY_SIZE(suite_methods))
int main(int GIT_UNUSED(argc), char *GIT_UNUSED(argv[])) #ifdef GIT_WIN32
int __cdecl
#else
int
#endif
main(int GIT_UNUSED(argc), char *GIT_UNUSED(argv[]))
{ {
unsigned int i, failures; unsigned int i, failures;