Merge branch 'master' of gitlab.ops-class.org:staff/os161

This commit is contained in:
Guru Prasad Srinivasa
2016-03-01 02:50:11 -05:00
4 changed files with 9 additions and 27 deletions

View File

@@ -60,7 +60,6 @@ int vsnprintf(char *buf, size_t len, const char *fmt, __va_list ap);
int tprintf(const char *fmt, ...);
int nprintf(const char *fmt, ...);
int printsf(const char *fmt, ...);
/* Print the argument string and then a newline. Returns 0 or -1 on error. */
int puts(const char *);

View File

@@ -39,8 +39,6 @@ time_t __time(time_t *secs, unsigned long *nsecs);
int tprintf(const char *fmt, ...);
int nprintf(const char *fmt, ...);
int printsf(const char *fmt, ...);
#ifdef DECLARE_NTOHLL
uint64_t ntohll(uint64_t);