Always use H_SPICE_COMMON_ prefix with uppercase filename (without
extension).
Signed-off-by: Frediano Ziglio <fziglio@xxxxxxxxxx>
---
common/backtrace.h | 6 +++---
common/canvas_base.h | 4 ++--
common/canvas_utils.h | 4 ++--
common/client_marshallers.h | 4 ++--
common/demarshallers.h | 4 ++--
common/draw.h | 6 +++---
common/lines.h | 6 +++---
common/log.h | 6 +++---
common/lz.h | 6 +++---
common/lz_common.h | 6 +++---
common/lz_config.h | 6 +++---
common/macros.h | 6 +++---
common/marshaller.h | 4 ++--
common/mem.h | 4 ++--
common/messages.h | 6 +++---
common/pixman_utils.h | 6 +++---
common/quic.h | 4 ++--
common/quic_config.h | 4 ++--
common/rect.h | 4 ++--
common/region.h | 4 ++--
common/ring.h | 4 ++--
common/rop3.h | 4 ++--
common/snd_codec.h | 4 ++--
common/ssl_verify.h | 6 +++---
common/sw_canvas.h | 4 ++--
25 files changed, 61 insertions(+), 61 deletions(-)
diff --git a/common/backtrace.h b/common/backtrace.h
index 894c027..72da6a5 100644
--- a/common/backtrace.h
+++ b/common/backtrace.h
@@ -16,8 +16,8 @@
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef BACKTRACE_H
-#define BACKTRACE_H
+#ifndef H_SPICE_COMMON_BACKTRACE
+#define H_SPICE_COMMON_BACKTRACE
#include <spice/macros.h>
@@ -31,4 +31,4 @@ void spice_backtrace(void);
SPICE_END_DECLS
-#endif // BACKTRACE_H
+#endif // H_SPICE_COMMON_BACKTRACE
diff --git a/common/canvas_base.h b/common/canvas_base.h
index 27e2751..f4a08df 100644
--- a/common/canvas_base.h
+++ b/common/canvas_base.h
@@ -16,8 +16,8 @@
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _H_CANVAS_BASE
-#define _H_CANVAS_BASE
+#ifndef H_SPICE_COMMON_CANVAS_BASE
+#define H_SPICE_COMMON_CANVAS_BASE
#include <spice/macros.h>
diff --git a/common/canvas_utils.h b/common/canvas_utils.h
index febf858..c7e564f 100644
--- a/common/canvas_utils.h
+++ b/common/canvas_utils.h
@@ -16,8 +16,8 @@
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _H_CANVAS_UTILS
-#define _H_CANVAS_UTILS
+#ifndef H_SPICE_COMMON_CANVAS_UTILS
+#define H_SPICE_COMMON_CANVAS_UTILS
#include <spice/types.h>
#include <spice/macros.h>
diff --git a/common/client_marshallers.h b/common/client_marshallers.h
index 912494b..f082934 100644
--- a/common/client_marshallers.h
+++ b/common/client_marshallers.h
@@ -16,8 +16,8 @@
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _H_MARSHALLERS
-#define _H_MARSHALLERS
+#ifndef H_SPICE_COMMON_CLIENT_MARSHALLERS
+#define H_SPICE_COMMON_CLIENT_MARSHALLERS
#include <spice/protocol.h>
diff --git a/common/demarshallers.h b/common/demarshallers.h
index 0accb62..97f1d50 100644
--- a/common/demarshallers.h
+++ b/common/demarshallers.h
@@ -14,8 +14,8 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef COMMON_DEMARSHALLERS_H_
-#define COMMON_DEMARSHALLERS_H_
+#ifndef H_SPICE_COMMON_DEMARSHALLERS
+#define H_SPICE_COMMON_DEMARSHALLERS
#include <stddef.h>
#include <spice/macros.h>
diff --git a/common/draw.h b/common/draw.h
index 5ce56e7..c852b06 100644
--- a/common/draw.h
+++ b/common/draw.h
@@ -28,8 +28,8 @@
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _H_SPICE_DRAW
-#define _H_SPICE_DRAW
+#ifndef H_SPICE_COMMON_DRAW
+#define H_SPICE_COMMON_DRAW
#include <spice/macros.h>
#include <spice/types.h>
@@ -302,4 +302,4 @@ static inline int spice_image_descriptor_is_lossy(const SpiceImageDescriptor *de
SPICE_END_DECLS
-#endif /* _H_SPICE_DRAW */
+#endif // H_SPICE_COMMON_DRAW
diff --git a/common/lines.h b/common/lines.h
index d98686f..f6c8184 100644
--- a/common/lines.h
+++ b/common/lines.h
@@ -46,8 +46,8 @@ SOFTWARE.
******************************************************************/
-#ifndef LINES_H
-#define LINES_H
+#ifndef H_SPICE_COMMON_LINES
+#define H_SPICE_COMMON_LINES
#include <stdlib.h>
#include <string.h>
@@ -133,4 +133,4 @@ extern int spice_canvas_clip_spans(pixman_region32_t *clip_region,
SPICE_END_DECLS
-#endif /* LINES_H */
+#endif // H_SPICE_COMMON_LINES
diff --git a/common/log.h b/common/log.h
index 74b3806..d352158 100644
--- a/common/log.h
+++ b/common/log.h
@@ -15,8 +15,8 @@
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef H_SPICE_LOG
-#define H_SPICE_LOG
+#ifndef H_SPICE_COMMON_LOG
+#define H_SPICE_COMMON_LOG
#include <stdarg.h>
#include <stdio.h>
@@ -97,4 +97,4 @@ enum { spice_extra_checks = 0 };
SPICE_END_DECLS
-#endif /* H_SPICE_LOG */
+#endif // H_SPICE_COMMON_LOG
diff --git a/common/lz.h b/common/lz.h
index 23910b8..9acffea 100644
--- a/common/lz.h
+++ b/common/lz.h
@@ -3,8 +3,8 @@
dictionary compression for images based on fastlz (http://www.fastlz.org/)
(Distributed under MIT license).
*/
-#ifndef __LZ_H
-#define __LZ_H
+#ifndef H_SPICE_COMMON_LZ
+#define H_SPICE_COMMON_LZ
#include <spice/macros.h>
@@ -79,4 +79,4 @@ void lz_destroy(LzContext *lz);
SPICE_END_DECLS
-#endif // __LZ_H
+#endif // H_SPICE_COMMON_LZ
diff --git a/common/lz_common.h b/common/lz_common.h
index 78df003..afea533 100644
--- a/common/lz_common.h
+++ b/common/lz_common.h
@@ -20,8 +20,8 @@
/*common header for encoder and decoder*/
-#ifndef _LZ_COMMON_H
-#define _LZ_COMMON_H
+#ifndef H_SPICE_COMMON_LZ_COMMON
+#define H_SPICE_COMMON_LZ_COMMON
#include <spice/macros.h>
#include "verify.h"
@@ -71,4 +71,4 @@ verify(SPICE_N_ELEMENTS(RGB_BYTES_PER_PIXEL) == (LZ_IMAGE_TYPE_A8 + 1));
SPICE_END_DECLS
-#endif // _LZ_COMMON_H
+#endif // H_SPICE_COMMON_LZ_COMMON
diff --git a/common/lz_config.h b/common/lz_config.h
index d8675a8..b44fede 100644
--- a/common/lz_config.h
+++ b/common/lz_config.h
@@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef __LZ_CONFIG_H
-#define __LZ_CONFIG_H
+#ifndef H_SPICE_COMMON_LZ_CONFIG
+#define H_SPICE_COMMON_LZ_CONFIG
#include <spice/types.h>
#include <spice/macros.h>
@@ -36,4 +36,4 @@
#endif // QXLDD
#endif //__GNUC__
-#endif //__LZ_CONFIG_H
+#endif // H_SPICE_COMMON_LZ_CONFIG
diff --git a/common/macros.h b/common/macros.h
index 1e3ded8..2f24ada 100644
--- a/common/macros.h
+++ b/common/macros.h
@@ -16,8 +16,8 @@
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __MACROS_H
-#define __MACROS_H
+#ifndef H_SPICE_COMMON_MACROS
+#define H_SPICE_COMMON_MACROS
#include "verify.h"
@@ -55,4 +55,4 @@
#define SPICE_VERIFY(cond) verify_expr(cond, (void)1)
-#endif /* __MACROS_H */
+#endif // H_SPICE_COMMON_MACROS
diff --git a/common/marshaller.h b/common/marshaller.h
index 0c27a48..2aeeea1 100644
--- a/common/marshaller.h
+++ b/common/marshaller.h
@@ -16,8 +16,8 @@
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _H_MARSHALLER
-#define _H_MARSHALLER
+#ifndef H_SPICE_COMMON_MARSHALLER
+#define H_SPICE_COMMON_MARSHALLER
#include <stdbool.h>
#include <spice/macros.h>
diff --git a/common/mem.h b/common/mem.h
index 68e024a..274f424 100644
--- a/common/mem.h
+++ b/common/mem.h
@@ -16,8 +16,8 @@
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _H_MEM
-#define _H_MEM
+#ifndef H_SPICE_COMMON_MEM
+#define H_SPICE_COMMON_MEM
#include "log.h"
#include <stdlib.h>
diff --git a/common/messages.h b/common/messages.h
index 14d5c64..2399b08 100644
--- a/common/messages.h
+++ b/common/messages.h
@@ -28,8 +28,8 @@
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _H_MESSAGES
-#define _H_MESSAGES
+#ifndef H_SPICE_COMMON_MESSAGES
+#define H_SPICE_COMMON_MESSAGES
#include <spice/protocol.h>
#include <spice/macros.h>
@@ -667,4 +667,4 @@ typedef struct SpiceMsgDisplayGlDraw {
SPICE_END_DECLS
-#endif /* _H_SPICE_PROTOCOL */
+#endif // H_SPICE_COMMON_MESSAGES
diff --git a/common/pixman_utils.h b/common/pixman_utils.h
index f892777..fd4ca6d 100644
--- a/common/pixman_utils.h
+++ b/common/pixman_utils.h
@@ -16,8 +16,8 @@
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _H__PIXMAN_UTILS
-#define _H__PIXMAN_UTILS
+#ifndef H_SPICE_COMMON_PIXMAN_UTILS
+#define H_SPICE_COMMON_PIXMAN_UTILS
#include <spice/types.h>
#include <spice/macros.h>
@@ -140,4 +140,4 @@ void spice_pixman_copy_rect(pixman_image_t *image,
SPICE_END_DECLS
-#endif /* _H__PIXMAN_UTILS */
+#endif // H_SPICE_COMMON_PIXMAN_UTILS
diff --git a/common/quic.h b/common/quic.h
index 398fb09..eb3afd4 100644
--- a/common/quic.h
+++ b/common/quic.h
@@ -16,8 +16,8 @@
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __QUIC_H
-#define __QUIC_H
+#ifndef H_SPICE_COMMON_QUIC
+#define H_SPICE_COMMON_QUIC
#include <spice/macros.h>
#include "quic_config.h"
diff --git a/common/quic_config.h b/common/quic_config.h
index fe89014..df92f52 100644
--- a/common/quic_config.h
+++ b/common/quic_config.h
@@ -16,8 +16,8 @@
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __QUIC_CONFIG_H
-#define __QUIC_CONFIG_H
+#ifndef H_SPICE_COMMON_QUIC_CONFIG
+#define H_SPICE_COMMON_QUIC_CONFIG
#include <spice/types.h>
#include <spice/macros.h>
diff --git a/common/rect.h b/common/rect.h
index 8c9faed..c3920e2 100644
--- a/common/rect.h
+++ b/common/rect.h
@@ -16,8 +16,8 @@
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _H_RECT
-#define _H_RECT
+#ifndef H_SPICE_COMMON_RECT
+#define H_SPICE_COMMON_RECT
#include <spice/macros.h>
#include "draw.h"
diff --git a/common/region.h b/common/region.h
index 9f92b32..6fa5068 100644
--- a/common/region.h
+++ b/common/region.h
@@ -16,8 +16,8 @@
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _H_REGION
-#define _H_REGION
+#ifndef H_SPICE_COMMON_REGION
+#define H_SPICE_COMMON_REGION
#include <stdint.h>
#include <spice/macros.h>
diff --git a/common/ring.h b/common/ring.h
index 4fd35ef..5054193 100644
--- a/common/ring.h
+++ b/common/ring.h
@@ -16,8 +16,8 @@
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _H_RING2
-#define _H_RING2
+#ifndef H_SPICE_COMMON_RING
+#define H_SPICE_COMMON_RING
#include "log.h"
diff --git a/common/rop3.h b/common/rop3.h
index 0f10e85..497930e 100644
--- a/common/rop3.h
+++ b/common/rop3.h
@@ -16,8 +16,8 @@
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _H_ROP3
-#define _H_ROP3
+#ifndef H_SPICE_COMMON_ROP3
+#define H_SPICE_COMMON_ROP3
#include <stdint.h>
#include <spice/macros.h>
diff --git a/common/snd_codec.h b/common/snd_codec.h
index e4122a4..a5be8d6 100644
--- a/common/snd_codec.h
+++ b/common/snd_codec.h
@@ -16,8 +16,8 @@
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _H_SND_CODEC
-#define _H_SND_CODEC
+#ifndef H_SPICE_COMMON_SND_CODEC
+#define H_SPICE_COMMON_SND_CODEC
#if HAVE_CELT051
diff --git a/common/ssl_verify.h b/common/ssl_verify.h
index e32ca54..3456c71 100644
--- a/common/ssl_verify.h
+++ b/common/ssl_verify.h
@@ -16,8 +16,8 @@
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef SSL_VERIFY_H
-#define SSL_VERIFY_H
+#ifndef H_SPICE_COMMON_SSL_VERIFY
+#define H_SPICE_COMMON_SSL_VERIFY
#if defined(WIN32)
#include <windows.h>
@@ -64,4 +64,4 @@ void spice_openssl_verify_free(SpiceOpenSSLVerify* verify);
SPICE_END_DECLS
-#endif // SSL_VERIFY_H
+#endif // H_SPICE_COMMON_SSL_VERIFY
diff --git a/common/sw_canvas.h b/common/sw_canvas.h
index 31f0644..9b23a6c 100644
--- a/common/sw_canvas.h
+++ b/common/sw_canvas.h
@@ -16,8 +16,8 @@
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _H__CANVAS
-#define _H__CANVAS
+#ifndef H_SPICE_COMMON_SW_CANVAS
+#define H_SPICE_COMMON_SW_CANVAS
#include <stdint.h>
#include <spice/macros.h>
--
2.17.2
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/spice-devel