Move include/buffer.h to include/gpxe/buffer.h

diff --git a/src/core/buffer.c b/src/core/buffer.c
index 5c31ff8de294e30c073c2211f31920c490efb745..81288ff5363ac783ea1f69fccbbc84bebfeb3b84 100644 (file)
--- a/src/core/buffer.c
+++ b/src/core/buffer.c
@@ -43,7 +43,7 @@
 #include "io.h"
 #include "errno.h"
 #include <assert.h>
-#include "buffer.h"
+#include <gpxe/buffer.h>
 
 /**
  * Initialise a buffer.

diff --git a/src/core/image.c b/src/core/image.c
index d8f96b5323e4a76d4f57825e2eaa439c777aea8f..ccf7b95ea9878e77b6d30b704a41c327cef67c40 100644 (file)
--- a/src/core/image.c
+++ b/src/core/image.c
@@ -1,5 +1,5 @@
 #include "dev.h"
-#include "buffer.h"
+#include <gpxe/buffer.h>
 #include "load_buffer.h"
 #include "image.h"
 #include <console.h>

diff --git a/src/include/dev.h b/src/include/dev.h
index 77452ad757b74c5fa9b49da846e62347e65e5c95..c46a366de8339f749e11bcb9a429abbdbf0f6fce 100644 (file)
--- a/src/include/dev.h
+++ b/src/include/dev.h
@@ -3,7 +3,7 @@
 
 #include "stdint.h"
 #include "string.h"
-#include "buffer.h"
+#include <gpxe/buffer.h>
 #include "dhcp.h" /* for dhcp_dev_id */
 #include <gpxe/tables.h>
 #include <assert.h>

diff --git a/src/include/buffer.h b/src/include/gpxe/buffer.h
similarity index 97%
rename from src/include/buffer.h
rename to src/include/gpxe/buffer.h
index ac4c31481359a3a87ac366945f91e2d61458811d..dba10b88904682f8a1467c8979f7f279e054181b 100644 (file)
--- a/src/include/buffer.h
+++ b/src/include/gpxe/buffer.h
@@ -1,5 +1,5 @@
-#ifndef BUFFER_H
-#define BUFFER_H
+#ifndef _GPXE_BUFFER_H
+#define _GPXE_BUFFER_H
 
 #include "compiler.h" /* for doxygen */
 #include "stdint.h"
@@ -94,4 +94,4 @@ extern void init_buffer ( struct buffer *buffer );
 extern int fill_buffer ( struct buffer *buffer, const void *data,
                         off_t offset, size_t len );
 
-#endif /* BUFFER_H */
+#endif /* _GPXE_BUFFER_H */

diff --git a/src/include/load_buffer.h b/src/include/load_buffer.h
index 5aa37410e27fca271dae89e216d0b8fde2c53f9f..b13c4e2a451826cb6138216109bf9bf30e5531f7 100644 (file)
--- a/src/include/load_buffer.h
+++ b/src/include/load_buffer.h
@@ -1,7 +1,7 @@
 #ifndef LOAD_BUFFER_H
 #define LOAD_BUFFER_H
 
-#include "buffer.h"
+#include <gpxe/buffer.h>
 
 /*
  * These functions are architecture-dependent, but the interface must

diff --git a/src/include/proto.h b/src/include/proto.h
index c16229ef10948b02c8ddd2b8ca0b6b5cebe9eaf3..a3861f2bd86732997960543acf22a7754730f539 100644 (file)
--- a/src/include/proto.h
+++ b/src/include/proto.h
@@ -2,7 +2,7 @@
 #define PROTO_H
 
 #include <gpxe/tables.h>
-#include "buffer.h"
+#include <gpxe/buffer.h>
 #include <gpxe/in.h>
 
 struct protocol {

diff --git a/src/include/tftp.h b/src/include/tftp.h
index ed99035eddc30837d4dd6db3b0e877380a1a9bc1..bdc63374f9e8f9306fe722193cb09050ca9d3b4a 100644 (file)
--- a/src/include/tftp.h
+++ b/src/include/tftp.h
@@ -4,7 +4,7 @@
 /** @file */
 
 #include <gpxe/in.h>
-#include "buffer.h"
+#include <gpxe/buffer.h>
 #include "nic.h"
 #include "ip.h"
 #include "udp.h"