summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortbanelwebmin@free.fr <tbanelwebmin@free.fr>2021-01-09 09:49:04 +0100
committertbanel <tbanelwebmin@free.fr>2021-01-14 21:20:00 +0100
commit9e8215f4a5df7d03ac787da78d28f69a4c18e7d3 (patch)
treeaade7d4be37b90f17e36ef03a80d4d0386cee508
parent1806abdc396d4987ed5e563c0204a13d14c25e1d (diff)
downloadorg-mode-9e8215f4a5df7d03ac787da78d28f69a4c18e7d3.tar.gz
ob-C.el: Fix missing C, C++ declaration
* lisp/ob-C.el (org-babel-C-utility-header-to-C): Add declaration of strcmp() for C and C++. * testing/examples/ob-C-test.org (Simple tests): Remove a spurious \n new line.
-rw-r--r--lisp/ob-C.el10
-rw-r--r--testing/examples/ob-C-test.org2
2 files changed, 9 insertions, 3 deletions
diff --git a/lisp/ob-C.el b/lisp/ob-C.el
index 6e33901..1dde289 100644
--- a/lisp/ob-C.el
+++ b/lisp/ob-C.el
@@ -4,6 +4,7 @@
;; Author: Eric Schulte
;; Thierry Banel
+;; Maintainer: Thierry Banel
;; Keywords: literate programming, reproducible research
;; Homepage: https://orgmode.org
@@ -425,7 +426,12 @@ of the same value."
into a column number."
(pcase org-babel-c-variant
((or `c `cpp)
- "int get_column_num (int nbcols, const char** header, const char* column)
+ (concat
+ (if (eq org-babel-c-variant 'c)
+ "extern "
+ "extern \"C\" ")
+ "int strcmp (const char *, const char *);
+int get_column_num (int nbcols, const char** header, const char* column)
{
int c;
for (c=0; c<nbcols; c++)
@@ -433,7 +439,7 @@ into a column number."
return c;
return -1;
}
-")
+"))
(`d
"int get_column_num (string[] header, string column)
{
diff --git a/testing/examples/ob-C-test.org b/testing/examples/ob-C-test.org
index 347607c..3b0a41b 100644
--- a/testing/examples/ob-C-test.org
+++ b/testing/examples/ob-C-test.org
@@ -159,6 +159,6 @@ void main()
writef ("%s ", tinomogen[i][j]);
writeln();
}
- writefln ("Friday %s\n", tinomogen_h(4,"day"));
+ writefln ("Friday %s", tinomogen_h(4,"day"));
}
#+end_src