Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to qemu-2.6.
[kvmfornfv.git]
/
qemu
/
roms
/
ipxe
/
src
/
include
/
ipxe
/
uri.h
diff --git
a/qemu/roms/ipxe/src/include/ipxe/uri.h
b/qemu/roms/ipxe/src/include/ipxe/uri.h
index
7613d57
..
00e5a24
100644
(file)
--- a/
qemu/roms/ipxe/src/include/ipxe/uri.h
+++ b/
qemu/roms/ipxe/src/include/ipxe/uri.h
@@
-7,7
+7,7
@@
*
*/
*
*/
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER
_OR_UBDL
);
#include <stddef.h>
#include <stdlib.h>
#include <stddef.h>
#include <stdlib.h>
@@
-203,7
+203,7
@@
extern char * resolve_path ( const char *base_path,
const char *relative_path );
extern struct uri * resolve_uri ( const struct uri *base_uri,
struct uri *relative_uri );
const char *relative_path );
extern struct uri * resolve_uri ( const struct uri *base_uri,
struct uri *relative_uri );
-extern struct uri * tftp_uri ( struct in_addr next_server,
+extern struct uri * tftp_uri ( struct in_addr next_server,
unsigned int port,
const char *filename );
extern void churi ( struct uri *uri );
const char *filename );
extern void churi ( struct uri *uri );