Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
Grpc
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
tci-gateway-module
Grpc
Commits
6fb2938b
Commit
6fb2938b
authored
Apr 12, 2015
by
Nicolas "Pixel" Noble
Browse files
Options
Downloads
Patches
Plain Diff
Getting a bit more laxist with the various GPR rules.
Also fixing WINSOCK check.
parent
e23cffb7
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
include/grpc/support/port_platform.h
+6
-6
6 additions, 6 deletions
include/grpc/support/port_platform.h
include/grpc/support/sync.h
+1
-1
1 addition, 1 deletion
include/grpc/support/sync.h
with
7 additions
and
7 deletions
include/grpc/support/port_platform.h
+
6
−
6
View file @
6fb2938b
...
@@ -220,20 +220,20 @@
...
@@ -220,20 +220,20 @@
#error Must define exactly one of GPR_ARCH_32, GPR_ARCH_64
#error Must define exactly one of GPR_ARCH_32, GPR_ARCH_64
#endif
#endif
#if defined(GPR_CPU_LINUX) + defined(GPR_CPU_POSIX) + defined(GPR_WIN32) + defined(GPR_CPU_IPHONE) != 1
#if defined(GPR_CPU_LINUX) + defined(GPR_CPU_POSIX) + defined(GPR_WIN32) + defined(GPR_CPU_IPHONE)
+ defined(GPR_CPU_CUSTOM)
!= 1
#error Must define exactly one of GPR_CPU_LINUX, GPR_CPU_POSIX, GPR_WIN32, GPR_CPU_IPHONE
#error Must define exactly one of GPR_CPU_LINUX, GPR_CPU_POSIX, GPR_WIN32, GPR_CPU_IPHONE
, GPR_CPU_CUSTOM
#endif
#endif
#if defined(GPR_POSIX_MULTIPOLL_WITH_POLL) && !defined(GPR_POSIX_SOCKET)
#if defined(GPR_POSIX_MULTIPOLL_WITH_POLL) && !defined(GPR_POSIX_SOCKET)
#error Must define GPR_POSIX_SOCKET to use GPR_POSIX_MULTIPOLL_WITH_POLL
#error Must define GPR_POSIX_SOCKET to use GPR_POSIX_MULTIPOLL_WITH_POLL
#endif
#endif
#if defined(GPR_POSIX_SOCKET) + defined(GPR_WIN
32
) != 1
#if defined(GPR_POSIX_SOCKET) + defined(GPR_WIN
SOCK_SOCKET) + defined(GPR_CUSTOM_SOCKET
) != 1
#error Must define exactly one of GPR_POSIX_SOCKET, GPR_WIN
32
#error Must define exactly one of GPR_POSIX_SOCKET, GPR_WIN
SOCK_SOCKET, GPR_CUSTOM_SOCKET
#endif
#endif
#if defined(GPR_MSVC_TLS) + defined(GPR_GCC_TLS) + defined(GPR_PTHREAD_TLS) != 1
#if defined(GPR_MSVC_TLS) + defined(GPR_GCC_TLS) + defined(GPR_PTHREAD_TLS)
+ defined(GPR_CUSTOM_TLS)
!= 1
#error Must define exactly one of GPR_MSVC_TLS, GPR_GCC_TLS, GPR_PTHREAD_TLS
#error Must define exactly one of GPR_MSVC_TLS, GPR_GCC_TLS, GPR_PTHREAD_TLS
, defined(GPR_CUSTOM_TLS)
#endif
#endif
typedef
int16_t
gpr_int16
;
typedef
int16_t
gpr_int16
;
...
...
This diff is collapsed.
Click to expand it.
include/grpc/support/sync.h
+
1
−
1
View file @
6fb2938b
...
@@ -60,7 +60,7 @@
...
@@ -60,7 +60,7 @@
#include
<grpc/support/sync_posix.h>
#include
<grpc/support/sync_posix.h>
#elif defined(GPR_WIN32)
#elif defined(GPR_WIN32)
#include
<grpc/support/sync_win32.h>
#include
<grpc/support/sync_win32.h>
#el
se
#el
if !defined(GPR_CUSTOM_SYNC)
#error Unable to determine platform for sync
#error Unable to determine platform for sync
#endif
#endif
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
sign in
to comment