diff options
| author |  Vijay Pai <vpai@google.com> | 2015-02-04 14:26:20 -0800 |
|---|---|---|
| committer | Vijay Pai <vpai@google.com> | 2015-02-04 14:26:20 -0800 |
| commit | 034152f5befdc06dbd9b4bf613b8ab152c2625df (patch) | |
| tree | 4350b869dd47a3d87f7afe466e18508f3cce54aa | |
| parent | e5c1f004f3be2819ea6a22df858c1b0e01ab2c55 (diff) | |
| parent | 6393dd36f1a3d2c0c1125f65e0c8329e1385e0b6 (diff) | |
Merge pull request #399 from nicolasnoble/build-fix
Fixing build.json by removing files that are no longer present.
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | build.json | 2 | ||||
| -rw-r--r-- | vsprojects/vs2013/gpr.vcxproj | 2 | ||||
| -rw-r--r-- | vsprojects/vs2013/gpr.vcxproj.filters | 6 |
4 files changed, 0 insertions, 12 deletions
@@ -1272,8 +1272,6 @@ PUBLIC_HEADERS_C += \ include/grpc/support/sync_win32.h \ include/grpc/support/thd.h \ include/grpc/support/time.h \ - include/grpc/support/time_posix.h \ - include/grpc/support/time_win32.h \ include/grpc/support/useful.h \ LIBGPR_OBJS = $(addprefix objs/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGPR_SRC)))) diff --git a/build.json b/build.json index 6fa3495aa3..d8a295f35c 100644 --- a/build.json +++ b/build.json @@ -221,8 +221,6 @@ "include/grpc/support/sync_win32.h", "include/grpc/support/thd.h", "include/grpc/support/time.h", - "include/grpc/support/time_posix.h", - "include/grpc/support/time_win32.h", "include/grpc/support/useful.h" ], "headers": [ diff --git a/vsprojects/vs2013/gpr.vcxproj b/vsprojects/vs2013/gpr.vcxproj index c77a61d782..0d429ab43d 100644 --- a/vsprojects/vs2013/gpr.vcxproj +++ b/vsprojects/vs2013/gpr.vcxproj @@ -92,8 +92,6 @@ <ClInclude Include="..\..\include\grpc\support\sync_win32.h" /> <ClInclude Include="..\..\include\grpc\support\thd.h" /> <ClInclude Include="..\..\include\grpc\support\time.h" /> - <ClInclude Include="..\..\include\grpc\support\time_posix.h" /> - <ClInclude Include="..\..\include\grpc\support\time_win32.h" /> <ClInclude Include="..\..\include\grpc\support\useful.h" /> </ItemGroup> <ItemGroup> diff --git a/vsprojects/vs2013/gpr.vcxproj.filters b/vsprojects/vs2013/gpr.vcxproj.filters index e385efcfb2..a992558654 100644 --- a/vsprojects/vs2013/gpr.vcxproj.filters +++ b/vsprojects/vs2013/gpr.vcxproj.filters @@ -138,12 +138,6 @@ <ClInclude Include="..\..\include\grpc\support\time.h"> <Filter>include\grpc\support</Filter> </ClInclude> - <ClInclude Include="..\..\include\grpc\support\time_posix.h"> - <Filter>include\grpc\support</Filter> - </ClInclude> - <ClInclude Include="..\..\include\grpc\support\time_win32.h"> - <Filter>include\grpc\support</Filter> - </ClInclude> <ClInclude Include="..\..\include\grpc\support\useful.h"> <Filter>include\grpc\support</Filter> </ClInclude> |