Skip to content

Commit 1a01d55

Browse files
authored
Change C include statements to use " instead of < (#16)
* start, use double quotes instead of angle brackets * fmt, fix ubuntu-old, add some debug info for the current ubuntu * try with newer version of ubuntu (and maybe clang?) * remove ubuntu-old, use ubuntu-20.04 for build
1 parent e446099 commit 1a01d55

File tree

5 files changed

+10
-16
lines changed

5 files changed

+10
-16
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,10 @@ jobs:
1313
matrix:
1414
build:
1515
- ubuntu
16-
- ubuntu-old
1716
- macos
1817
include:
1918
- build: ubuntu
20-
os: ubuntu-latest
21-
rust: stable
22-
- build: ubuntu-old
23-
os: ubuntu-18.04
19+
os: ubuntu-20.04
2420
rust: stable
2521
- build: macos
2622
os: macos-latest

protobuf-native/src/compiler.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515

1616
#pragma once
1717

18-
#include <google/protobuf/compiler/importer.h>
19-
18+
#include "google/protobuf/compiler/importer.h"
2019
#include "rust/cxx.h"
2120

2221
namespace protobuf_native {

protobuf-native/src/internal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
#pragma once
1717

18-
#include <absl/strings/string_view.h>
18+
#include "absl/strings/string_view.h"
1919

2020
namespace protobuf_native {
2121
namespace internal {

protobuf-native/src/io.h

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,12 @@
1515

1616
#pragma once
1717

18-
#include <google/protobuf/io/coded_stream.h>
19-
#include <google/protobuf/io/zero_copy_stream.h>
20-
#include <google/protobuf/io/zero_copy_stream_impl.h>
21-
#include <google/protobuf/io/zero_copy_stream_impl_lite.h>
22-
2318
#include <memory>
2419

20+
#include "google/protobuf/io/coded_stream.h"
21+
#include "google/protobuf/io/zero_copy_stream.h"
22+
#include "google/protobuf/io/zero_copy_stream_impl.h"
23+
#include "google/protobuf/io/zero_copy_stream_impl_lite.h"
2524
#include "rust/cxx.h"
2625

2726
namespace protobuf_native {

protobuf-native/src/lib.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515

1616
#pragma once
1717

18-
#include <google/protobuf/descriptor.h>
19-
#include <google/protobuf/descriptor.pb.h>
20-
2118
#include <memory>
2219

20+
#include "google/protobuf/descriptor.h"
21+
#include "google/protobuf/descriptor.pb.h"
22+
2323
using namespace google::protobuf;
2424

2525
namespace protobuf_native {

0 commit comments

Comments
 (0)