[vte] all: Don't export _vte_debug_* symbols



commit 9d01365de2d925fb512476473eb9cf46028cfd8a
Author: Christian Persch <chpe gnome org>
Date:   Sat May 7 19:46:42 2011 +0200

    all: Don't export _vte_debug_* symbols
    
    Debug symbols are for internal use only.
    
    Conflicts:
        src/Makefile.am

 src/Makefile.am |    4 +++-
 src/debug.h     |    9 +++++++++
 src/vteapp.c    |    2 ++
 3 files changed, 14 insertions(+), 1 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index e94464e..6ccdfac 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -101,7 +101,7 @@ libvte_ VTE_API_MAJOR_VERSION@_ VTE_API_MINOR_VERSION@_la_LIBADD = $(VTE_LIBS)
 libvte_ VTE_API_MAJOR_VERSION@_ VTE_API_MINOR_VERSION@_la_LDFLAGS = \
        $(VTE_LDFLAGS) \
        -version-info $(LT_VERSION_INFO) \
-       -export-symbols-regex "^vte_terminal_.*|^vte_pty_.*|^vte_get_.*|_vte_debug_.*" \
+       -export-symbols-regex "^vte_terminal_.*|^vte_pty_.*|^vte_get_.*" \
        @LIBTOOL_EXPORT_OPTIONS@ @LIBTOOL_FLAGS@ \
        $(AM_LDFLAGS)
 
@@ -158,6 +158,8 @@ bin_PROGRAMS = vte- VTE_API_MAJOR_VERSION@  VTE_API_MINOR_VERSION@
 
 vte_ VTE_API_MAJOR_VERSION@_ VTE_API_MINOR_VERSION@_SOURCES = \
        vteapp.c \
+       debug.c \
+       debug.h \
        $(NULL)
 
 vte_ VTE_API_MAJOR_VERSION@_ VTE_API_MINOR_VERSION@_CPPFLAGS = \
diff --git a/src/debug.h b/src/debug.h
index d54da06..4575a52 100644
--- a/src/debug.h
+++ b/src/debug.h
@@ -25,6 +25,15 @@
 
 #include <glib.h>
 
+#ifndef VTE_COMPILATION
+#define _vte_debug_flags _vte_external_debug_flags
+#define _vte_debug_init  _vte_external_debug_init
+#define _vte_debug_on    _vte_external_debug_on
+#if !defined(__GNUC__) || !G_HAVE_GNUC_VARARGS
+#define _vte_debug_print _vte_external_debug_print
+#endif
+#endif
+
 G_BEGIN_DECLS
 
 typedef enum {
diff --git a/src/vteapp.c b/src/vteapp.c
index 8472b03..eb55409 100644
--- a/src/vteapp.c
+++ b/src/vteapp.c
@@ -725,6 +725,8 @@ main(int argc, char **argv)
        GtkPolicyType scrollbar_policy = GTK_POLICY_ALWAYS;
        VtePtyFlags pty_flags = VTE_PTY_DEFAULT;
 
+        _vte_debug_init();
+
        /* Have to do this early. */
        if (getenv("VTE_PROFILE_MEMORY")) {
                if (atol(getenv("VTE_PROFILE_MEMORY")) != 0) {


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]