Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild
This commit is contained in:
@@ -252,9 +252,9 @@ static int parse_comment(const char *file, unsigned long len)
|
||||
}
|
||||
|
||||
/* FIXME: Handle .s files differently (eg. # starts comments) --RR */
|
||||
static int parse_file(const signed char *fname, struct md4_ctx *md)
|
||||
static int parse_file(const char *fname, struct md4_ctx *md)
|
||||
{
|
||||
signed char *file;
|
||||
char *file;
|
||||
unsigned long i, len;
|
||||
|
||||
file = grab_file(fname, &len);
|
||||
@@ -332,7 +332,7 @@ static int parse_source_files(const char *objfile, struct md4_ctx *md)
|
||||
Sum all files in the same dir or subdirs.
|
||||
*/
|
||||
while ((line = get_next_line(&pos, file, flen)) != NULL) {
|
||||
signed char* p = line;
|
||||
char* p = line;
|
||||
if (strncmp(line, "deps_", sizeof("deps_")-1) == 0) {
|
||||
check_files = 1;
|
||||
continue;
|
||||
@@ -458,7 +458,7 @@ out:
|
||||
close(fd);
|
||||
}
|
||||
|
||||
static int strip_rcs_crap(signed char *version)
|
||||
static int strip_rcs_crap(char *version)
|
||||
{
|
||||
unsigned int len, full_len;
|
||||
|
||||
|
Reference in New Issue
Block a user