-
Notifications
You must be signed in to change notification settings - Fork 2.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
little changes #8410
little changes #8410
Changes from 2 commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,7 @@ | ||
# https://travis-ci.org | ||
|
||
sudo: required | ||
|
||
language: cpp | ||
|
||
os: linux | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1192,14 +1192,14 @@ u32 _AtracDecodeData(int atracID, u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u3 | |
} | ||
|
||
static u32 sceAtracDecodeData(int atracID, u32 outAddr, u32 numSamplesAddr, u32 finishFlagAddr, u32 remainAddr) { | ||
int ret = -1; | ||
//int ret = -1; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. just delete this line instead |
||
|
||
// Note that outAddr being null is completely valid here, used to skip data. | ||
|
||
u32 numSamples = 0; | ||
u32 finish = 0; | ||
int remains = 0; | ||
ret = _AtracDecodeData(atracID, Memory::GetPointer(outAddr), outAddr, &numSamples, &finish, &remains); | ||
int ret = _AtracDecodeData(atracID, Memory::GetPointer(outAddr), outAddr, &numSamples, &finish, &remains); | ||
if (ret != (int)ATRAC_ERROR_BAD_ATRACID && ret != (int)ATRAC_ERROR_NO_DATA) { | ||
if (Memory::IsValidAddress(numSamplesAddr)) | ||
Memory::Write_U32(numSamples, numSamplesAddr); | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -260,8 +260,8 @@ static int sceNetAdhocPdpCreate(const char *mac, u32 port, int bufferSize, u32 u | |
//return ERROR_NET_ADHOC_PORT_IN_USE; | ||
|
||
// Create Internet UDP Socket | ||
int usocket = (int)INVALID_SOCKET; | ||
usocket = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); | ||
// int usocket = (int)INVALID_SOCKET; | ||
int usocket = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); | ||
// Valid Socket produced | ||
if (usocket != INVALID_SOCKET) { | ||
// Change socket buffer size when necessary | ||
|
@@ -1644,8 +1644,8 @@ static int sceNetAdhocPtpOpen(const char *srcmac, int sport, const char *dstmac, | |
// Valid Arguments | ||
if (bufsize > 0 && rexmt_int > 0 && rexmt_cnt > 0) { | ||
// Create Infrastructure Socket | ||
int tcpsocket = (int)INVALID_SOCKET; | ||
tcpsocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); | ||
// int tcpsocket = (int)INVALID_SOCKET; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. same here, delete, don't comment |
||
int tcpsocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); | ||
|
||
// Valid Socket produced | ||
if (tcpsocket > 0) { | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -141,7 +141,7 @@ void* NSGLGetProcAddress (const GLubyte *name) | |
void* NSGLGetProcAddress (const GLubyte *name) | ||
{ | ||
static const struct mach_header* image = NULL; | ||
NSSymbol symbol; | ||
//NSSymbol symbol; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. again, delete, don't comment out. |
||
char* symbolName; | ||
if (NULL == image) | ||
{ | ||
|
@@ -151,10 +151,10 @@ void* NSGLGetProcAddress (const GLubyte *name) | |
symbolName = malloc(strlen((const char*)name) + 2); | ||
strcpy(symbolName+1, (const char*)name); | ||
symbolName[0] = '_'; | ||
symbol = NULL; | ||
//symbol = NULL; | ||
/* if (NSIsSymbolNameDefined(symbolName)) | ||
symbol = NSLookupAndBindSymbol(symbolName); */ | ||
symbol = image ? NSLookupSymbolInImage(image, symbolName, NSLOOKUPSYMBOLINIMAGE_OPTION_BIND | NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR) : NULL; | ||
NSSSymbol symbol = image ? NSLookupSymbolInImage(image, symbolName, NSLOOKUPSYMBOLINIMAGE_OPTION_BIND | NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR) : NULL; | ||
free(symbolName); | ||
if( symbol ) return NSAddressOfSymbol(symbol); | ||
#ifdef GLEW_APPLE_GLX | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
travis do some changes the some year, the new proyect added after 2014, need include this line to works if it requieres root, in the proyect don't affects this but forks yes, and is very problematic when at least i try to make a pull request, any pr fails but if i do a change to can works with travis but that commit will be reflacted in the pr, finally i think its better inlcude it and simplify this.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe that was part of the whitelisting we got earlier, because it was before/around when they added the containers.
I suppose this isn't an issue, though.
-[Unknown]
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
mm, well its right don't is a issdue of the main proyects, but as we saw with all my failed commits (resync fork) in the irc affects the forks, anyway i only can opine about this, then remove or not?