diff options
| author | Primiano Tucci <primiano@google.com> | 2014-09-30 14:46:28 +0100 |
|---|---|---|
| committer | Primiano Tucci <primiano@google.com> | 2014-09-30 14:46:28 +0100 |
| commit | 7c4e52cd7aebb9f2fa64355c58bc75509685da94 (patch) | |
| tree | bbdd45cda3f7f15eae3f9dfa9ac4d6a604d82479 /crypto/bio/socket_helper.c | |
| parent | 208436baefdf6180355219406c666c259c7fc450 (diff) | |
| parent | 885164b8d921ef7dba08b9e5ae031bf7350bf4ff (diff) | |
| download | src-lollipop-mr1-dev.tar.gz | |
Merge from Chromium at DEPS revision 267aeeb8d85candroid-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1lollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-release
This commit was generated by merge_to_master.py.
Change-Id: I9b1c013632df72dcd4e450d6a3b7749444191f77
Diffstat (limited to 'crypto/bio/socket_helper.c')
| -rw-r--r-- | crypto/bio/socket_helper.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/bio/socket_helper.c b/crypto/bio/socket_helper.c index 0d7d21a..ba65a1a 100644 --- a/crypto/bio/socket_helper.c +++ b/crypto/bio/socket_helper.c @@ -97,7 +97,7 @@ int bio_socket_nbio(int sock, int on) { #endif } -void bio_clear_socket_error() {} +void bio_clear_socket_error(void) {} int bio_sock_error(int sock) { int error; |