Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7f624ee4e2fe
Choose a base ref
...
head repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 40da7cdfbe60
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jun 3, 2020

  1. Added extern "C" linkage specifier around lxi.h for compatibility wit… 

    …h pre-1.13 liblxi versions
    @azonenberg
    azonenberg committed Jun 3, 2020
    Copy the full SHA
    40da7cd View commit details
Showing with 3 additions and 0 deletions.
  1. +3 −0 scopehal/scopehal.h
3 changes: 3 additions & 0 deletions scopehal/scopehal.h
View file
Original file line number Diff line number Diff line change
@@ -46,7 +46,10 @@

#include <yaml-cpp/yaml.h>

extern "C"
{
#include <lxi.h>
}

#include "../log/log.h"
#include "../graphwidget/Graph.h"