Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb4ae9c6 authored by Colin Cross's avatar Colin Cross Committed by Android (Google) Code Review
Browse files

Merge "Remove definitions that are now in bionic libc"

parents 2b9c1a8b 1b1fd612

sh/miscbltin.c

+0 −2
Original line number Diff line number Diff line
@@ -277,8 +277,6 @@ umaskcmd(int argc, char **argv) 
	return 0;

}



typedef unsigned long rlim_t;



#if 1

/*

 * ulimit builtin

toolbox/newfs_msdos.c

+0 −29
Original line number Diff line number Diff line
@@ -235,35 +235,6 @@ static void setstr(u_int8_t *, const char *, size_t); 
static void usage(void);



#ifdef ANDROID

static void err(int val, const char *fmt, ...) {

    va_list ap;

    va_start(ap, fmt);

    char *fmt2;

    asprintf(&fmt2, "%s\n", fmt);

    vfprintf(stderr, fmt2, ap);

    free(fmt2);

    va_end(ap);

}



static void errx(int val, const char *fmt, ...) {

    va_list ap;

    va_start(ap, fmt);

    char *fmt2;

    asprintf(&fmt2, "%s\n", fmt);

    vfprintf(stderr, fmt2, ap);

    free(fmt2);

    va_end(ap);

}



static void warnx(const char *fmt, ...) {

    va_list ap;

    va_start(ap, fmt);

    char *fmt2;

    asprintf(&fmt2, "%s\n", fmt);

    vfprintf(stderr, fmt2, ap);

    free(fmt2);

    va_end(ap);

}

#define powerof2(x)     ((((x) - 1) & (x)) == 0)

#define howmany(x, y)   (((x) + ((y) - 1)) / (y))

#define MAX(x,y) ((x) > (y) ? (x) : (y))