U1DB

Merge lp:~dobey/u1db/update-13-10 into lp:u1db/stable-13-10

  1. update-13-10
  2. Merge into stable-13-10
Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: no longer in the source branch.
Merged at revision: 440
Proposed branch: lp:~dobey/u1db/update-13-10
Merge into: lp:u1db/stable-13-10
Diff against target: 40 lines (+10/-2)
1 file modified
include/u1db/u1db.h (+10/-2)
To merge this branch: bzr merge lp:~dobey/u1db/update-13-10
Reviewer Review Type Date Requested Status
Roberto Alsina (community) Approve
Review via email: mp+178759@code.launchpad.net

Commit message

[José Expósito]

    Add missing extern "C" usage for compatibility with C++.

To post a comment you must log in.
Revision history for this message
Roberto Alsina (ralsina) :
review: Approve
lp:~dobey/u1db/update-13-10 updated
440. By dobey

[José Expósito]

    Add missing extern "C" usage for compatibility with C++.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'include/u1db/u1db.h'
2--- include/u1db/u1db.h 2012-10-19 14:52:05 +0000
3+++ include/u1db/u1db.h 2013-08-06 14:10:47 +0000
4@@ -19,7 +19,7 @@
5 */
6
7 /*! \mainpage U1DB Index Page
8- *
9+ *
10 * \section intro_sec Introduction
11 *
12 * This is the C implementation of the u1db protocol, with a SQLite backend.
13@@ -29,6 +29,10 @@
14 *
15 */
16
17+#ifdef __cplusplus
18+extern "C" {
19+#endif
20+
21 #ifndef _U1DB_H_
22 #define _U1DB_H_
23
24@@ -340,7 +344,7 @@
25 * sync.
26 */
27 int u1db_sync(u1database *db, const char *url, const u1db_creds *creds,
28- int *local_gen);
29+ int *local_gen);
30
31
32 /**
33@@ -460,3 +464,7 @@
34 void *context, u1db_doc_callback cb);
35
36 #endif // _U1DB_H_
37+
38+#ifdef __cplusplus
39+}
40+#endif

Subscribers

People subscribed via source and target branches

to all changes: