← Back to branch summary

~linaro-graphics-wg/libmatrix/misc-changes-glmark2

« back to all changes in this revision

Viewing changes to log.cc

  • Committer: Jesse Barker
  • Date: 2012-01-27 14:58:24 UTC
  • mfrom: (33.1.3 libmatrix)
  • Revision ID: jesse.barker@linaro.org-20120127145824-9qguff82bzquf87g
Merge of lp:~linaro-graphics-wg/libmatrix/log-fixes to address issues with Android support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
log.cc
67
67
        if (!color.empty())
68
68
        {
69
69
            start_color = color;
70
 
            if (color[0] != 0)
71
 
            {
72
 
                end_color = terminal_color_normal;
73
 
            }
 
70
            end_color = terminal_color_normal;
74
71
        }
75
72
        linePrefix = start_color + prefix + end_color + colon;
76
73
    }
151
148
    va_start(ap, fmt);
152
149
    __android_log_vprint(ANDROID_LOG_INFO, appname.c_str(), fmt, ap);
153
150
    va_end(ap);
154
 
}q
 
151
}
155
152
 
156
153
void
157
154
Log::debug(const char *fmt, ...)
158
155
{
159
 
    if (!Options::show_debug)
 
156
    if (!do_debug_)
160
157
        return;
161
158
    va_list ap;
162
159
    va_start(ap, fmt);