Browse Source

Fix c++ identity crisis in external_metro

The program is C++ but includes C headers and uses extern "C"
clauses around the ExternalMetro class.
pull/244/head
Andrew Cooper 10 years ago
parent
commit
e9a96be098
2 changed files with 6 additions and 15 deletions
  1. +1
    -1
      tests/external_metro.cpp
  2. +5
    -14
      tests/external_metro.h

+ 1
- 1
tests/external_metro.cpp View File

@@ -17,7 +17,7 @@
*/

#include "external_metro.h"
#include <stdio.h>
#include <cstdio>

typedef jack_default_audio_sample_t sample_t;



+ 5
- 14
tests/external_metro.h View File

@@ -21,18 +21,13 @@
#ifndef __external_metro__
#define __external_metro__

#ifdef __cplusplus
extern "C"
{
#endif

#include <stdlib.h>
#include <stdio.h>
#include <errno.h>
#include <cstdlib>
#include <cstdio>
#include <cerrno>
#include <unistd.h>
#include <math.h>
#include <cmath>
#include <getopt.h>
#include <string.h>
#include <cstring>
#include <jack/jack.h>
#include <jack/transport.h>

@@ -63,8 +58,4 @@ extern "C"
static void shutdown (void* arg);
};

#ifdef __cplusplus
}
#endif

#endif

Loading…
Cancel
Save