[oe-commits] md : minicom: fix compile error due to conflicting function names

git version control git at git.openembedded.org
Wed Jun 10 18:19:12 UTC 2009


Module: openembedded.git
Branch: xora/angstrom-srcpv
Commit: a9a408c12539e4bb6679563ac8da28c32aa41f3a
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=a9a408c12539e4bb6679563ac8da28c32aa41f3a

Author: md <md at freiheit.com>
Date:   Mon Jun  8 19:31:47 2009 +0200

minicom: fix compile error due to conflicting function names
- the `getline()' function used in minicom.c may have been defined in stdio.h if __USE_GNU is defined
- as a fix that function name is redefined within minicom.c

---

 .../minicom-2.3/rename-conflicting-functions.patch |   13 +++++++++++++
 recipes/minicom/minicom_2.3.bb                     |    1 +
 2 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/recipes/minicom/minicom-2.3/rename-conflicting-functions.patch b/recipes/minicom/minicom-2.3/rename-conflicting-functions.patch
new file mode 100644
index 0000000..c344203
--- /dev/null
+++ b/recipes/minicom/minicom-2.3/rename-conflicting-functions.patch
@@ -0,0 +1,13 @@
+--- minicom-2.3/src/minicom.c-orig	2009-06-08 14:49:07.000000000 +0200
++++ minicom-2.3/src/minicom.c	2009-06-08 14:50:23.000000000 +0200
+@@ -63,6 +63,10 @@
+ }
+ #endif /*DEBUG*/
+ 
++#ifdef __USE_GNU
++#define getline minicom_getline
++#endif
++
+ /*
+  * Sub - menu's.
+  */
diff --git a/recipes/minicom/minicom_2.3.bb b/recipes/minicom/minicom_2.3.bb
index 5b32401..736ac84 100644
--- a/recipes/minicom/minicom_2.3.bb
+++ b/recipes/minicom/minicom_2.3.bb
@@ -2,6 +2,7 @@ SECTION = "console/network"
 DEPENDS = "ncurses"
 LICENSE = "GPL"
 SRC_URI = "http://alioth.debian.org/frs/download.php/2332/minicom-${PV}.tar.gz \
+	file://rename-conflicting-functions.patch;patch=1 \
 	"
 
 inherit autotools gettext





More information about the Openembedded-commits mailing list