Skip to content

Commit

Permalink
pkg/libb2: rename config.h to libb2_config.h
Browse files Browse the repository at this point in the history
This is to avoid conflics with other config.h files, e.g. when building
for esp8266 where $(NEWLIB)/xtensa-lx106-elf/include/config.h gets
included instead.
  • Loading branch information
benpicco committed Sep 1, 2019
1 parent a3a0280 commit ab5ce3b
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 3 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef CONFIG_H
#define CONFIG_H
#ifndef PKG_LIBB2_CONFIG_H
#define PKG_LIBB2_CONFIG_H

#ifdef __cplusplus
extern "C" {
Expand All @@ -21,4 +21,4 @@ extern "C" {
#ifdef __cplusplus
}
#endif
#endif /* CONFIG_H */
#endif /* PKG_LIBB2_CONFIG_H */
26 changes: 26 additions & 0 deletions pkg/libb2/patches/0001-rename-config.h-to-libb2_config.h.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
From 213f6bb69962154a890925124d44aa8f3361270e Mon Sep 17 00:00:00 2001
From: Benjamin Valentin <benpicco@googlemail.com>
Date: Sun, 1 Sep 2019 17:21:06 +0200
Subject: [PATCH] rename config.h to libb2_config.h

This avoids conflics with other config.h files
---
src/blake2-impl.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/blake2-impl.h b/src/blake2-impl.h
index c99e3de..a8622e7 100644
--- a/src/blake2-impl.h
+++ b/src/blake2-impl.h
@@ -17,7 +17,7 @@
#include <stddef.h>
#include <stdint.h>
#include <string.h>
-#include "config.h"
+#include "libb2_config.h"

#define BLAKE2_IMPL_CAT(x,y) x ## y
#define BLAKE2_IMPL_EVAL(x,y) BLAKE2_IMPL_CAT(x,y)
--
2.20.1

0 comments on commit ab5ce3b

Please sign in to comment.