Merge pull request #1025 from mfoster96/develop

Fix for issue #1024: arm-linux-androideabi-g++ Compiler Error in /cpu…
2016-12-18 14:47:59 +08:00 · 2016-12-18 14:47:59 +08:00 · e7bd736802
parent 14571d8b08 19934bea8c
commit e7bd736802
1 changed files with 1 additions and 1 deletions
--- a/cpuid_arm.c
+++ b/cpuid_arm.c
@ -74,7 +74,7 @@ int get_feature(char *search)
  	fclose(infile);


-	if( p == NULL ) return;
+	if( p == NULL ) return 0;

 	t = strtok(p," ");
 	while( t = strtok(NULL," "))