Merge branch 'master' into great-refactor
# Conflicts: # libctru/include/3ds/services/httpc.h
This commit is contained in:
commit
e4775572c2
@ -76,7 +76,7 @@ int main()
|
||||
printf("Downloading %s\n",url);
|
||||
gfxFlushBuffers();
|
||||
|
||||
ret = httpcOpenContext(&context, url , 0);
|
||||
ret = httpcOpenContext(&context, url, 1);
|
||||
printf("return from httpcOpenContext: %"PRId32"\n",ret);
|
||||
gfxFlushBuffers();
|
||||
|
||||
|
@ -9,7 +9,7 @@ endif
|
||||
include $(DEVKITARM)/base_rules
|
||||
|
||||
export LIBCTRU_MAJOR := 0
|
||||
export LIBCTRU_MINOR := 5
|
||||
export LIBCTRU_MINOR := 6
|
||||
export LIBCTRU_PATCH := 0
|
||||
|
||||
|
||||
|
@ -14,8 +14,6 @@ Result httpcInit(void)
|
||||
if(__httpc_servhandle)return 0;
|
||||
if((ret=srvGetServiceHandle(&__httpc_servhandle, "http:C")))return ret;
|
||||
|
||||
//*((u32*)0x600) = __httpc_servhandle;
|
||||
|
||||
ret = HTTPC_Initialize(__httpc_servhandle);
|
||||
if(ret!=0)return ret;
|
||||
|
||||
@ -27,6 +25,8 @@ void httpcExit(void)
|
||||
if(__httpc_servhandle==0)return;
|
||||
|
||||
svcCloseHandle(__httpc_servhandle);
|
||||
|
||||
__httpc_servhandle = 0;
|
||||
}
|
||||
|
||||
Result httpcOpenContext(httpcContext *context, char* url, u32 use_defaultproxy)
|
||||
|
Loading…
Reference in New Issue
Block a user