Compiz

Merge lp:~mskala/compiz/remove_extern_C into lp:compiz/0.9.12

  1. remove_extern_C
  2. Merge into 0.9.12
Proposed by Matija Skala
Status: Merged
Approved by: Stephen M. Webb
Approved revision: 3879
Merged at revision: 3890
Proposed branch: lp:~mskala/compiz/remove_extern_C
Merge into: lp:compiz/0.9.12
Diff against target: 19 lines (+0/-3)
1 file modified
compizconfig/libcompizconfig/src/compiz.cpp (+0/-3)
To merge this branch: bzr merge lp:~mskala/compiz/remove_extern_C
Reviewer Review Type Date Requested Status
Stephen M. Webb Approve
Review via email: mp+229419@code.launchpad.net

Commit message

remove 'extern "C"' hack

Description of the change

Removed 'extern "C"' line, because it is not necessary and only causes compile problems. Functions are already declared as C-linked in the include files.

To post a comment you must log in.
Revision history for this message
Stephen M. Webb (bregma) wrote :

Build fine. Since it's a build-time thing, in it goes.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'compizconfig/libcompizconfig/src/compiz.cpp'
2--- compizconfig/libcompizconfig/src/compiz.cpp 2013-05-13 13:23:20 +0000
3+++ compizconfig/libcompizconfig/src/compiz.cpp 2014-08-04 09:23:18 +0000
4@@ -25,8 +25,6 @@
5 #include <google/protobuf/io/zero_copy_stream_impl.h>
6 #endif
7
8-extern "C"
9-{
10 #ifdef HAVE_CONFIG_H
11 # include "../config.h"
12 #endif
13@@ -46,7 +44,6 @@
14
15 #include <ccs.h>
16 #include "ccs-private.h"
17-}
18
19 #include <string>
20

Subscribers

People subscribed via source and target branches