[gpsd-commit-watch] [SCM] GPSD branch, master, updated. release-3.11-167-g4b83ce7

[Jon Schlueter]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GPSD".

The branch, master has been updated
       via  4b83ce7d7f251398afe8248aa5274ac9a9ec7270 (commit)
      from  98e9e8bfd346787b8508f4e02b8b1e28564108af (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4b83ce7d7f251398afe8248aa5274ac9a9ec7270
Author: Michal Privoznik <address@hidden>
Date:   Wed Nov 19 09:18:54 2014 +0100

    libgps.h: Fix linkage problem
    
    When building with libQgpsmm=1 enabled I see this failure:
    
    g++ -o libgps_core-qt.os -c -D_GNU_SOURCE -Wextra -Wall -Wno-uninitialized 
-Wno-missing-field-initializers -Wcast-align -Wmissing-declarations 
-Wmissing-prototypes -Wpointer-arith -Wreturn-type -pthread 
-Wmissing-declarations -O2 -pthread -fPIC -DUSE_QT -DQT_SHARED 
-I/usr/include/qt4 -I/usr/include/qt4/QtNetwork -I/usr/include/qt4/QtCore 
libgps_core.c
    cc1plus: warning: command line option '-Wmissing-prototypes' is valid for 
C/ObjC but not for C++
    In file included from libgps_core.c:19:0:
    gps_json.h:41:28: error: conflicting declaration of 'int 
json_ais_read(const char*, char*, size_t, ais_t*, const char**)' with 'C' 
linkage
         /address@hidden@*/const char **);
                                ^
    In file included from libgps_core.c:18:0:
    libgps.h:34:12: note: previous declaration with 'C++' linkage
     extern int json_ais_read(const char *, char *, size_t, struct ais_t *,
                ^
    scons: *** [libgps_core-qt.os] Error 1
    scons: building terminated because of errors.
    
    Digging more into the problem shows, libgps.h doesn't have the
    functions enclosed within 'extern "C"' mark. Therefore, g++ mangled
    the function names and hence the error.
    
    Signed-off-by: Michal Privoznik <address@hidden>
    Signed-off-by: Jon Schlueter <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 libgps.h |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
GPSD