~ubuntu-branches/ubuntu/oneiric/openvpn/oneiric

« back to all changes in this revision

Viewing changes to perf.c

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2011-06-16 18:33:37 UTC
  • mfrom: (1.3.6 upstream)
  • mto: This revision was merged to the branch mainline in revision 46.
  • Revision ID: james.westby@ubuntu.com-20110616183337-etb3qgbwjkn8zniq
Tags: upstream-2.2.0
ImportĀ upstreamĀ versionĀ 2.2.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
33
33
 
34
34
#include "memdbg.h"
35
35
 
36
 
#ifdef USE_PTHREAD
37
 
#error ENABLE_PERFORMANCE_METRICS is incompatible with USE_PTHREAD
38
 
#endif
39
 
 
40
36
static const char *metric_names[] = {
41
37
  "PERF_BIO_READ_PLAINTEXT",
42
38
  "PERF_BIO_WRITE_PLAINTEXT",
291
287
}
292
288
 
293
289
#else
 
290
#ifdef _MSC_VER  /* Dummy function needed to avoid empty file compiler warning in Microsoft VC */
294
291
static void dummy(void) {}
295
292
#endif
 
293
#endif