third_party/apache-portable-runtime/diff.patch - Issue 1612863004: Revert of [third-party] Netty fork of Tomcat Native

Side by Side Diff: third_party/apache-portable-runtime/diff.patch

Issue 1612863004: Revert of [third-party] Netty fork of Tomcat Native (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

OLD	NEW
	(Empty)
1 diff -ruN ./original/include/apr.h ./changed/include/apr.h

2 --- ./original/include/apr.h 2016-01-04 13:12:47.009354091 -0500

3 +++ ./changed/include/apr.h 2016-01-04 10:18:31.701765503 -0500

4 @@ -80,7 +80,7 @@

5 #define APR_HAVE_LIMITS_H 1

6 #define APR_HAVE_NETDB_H 1

7 #define APR_HAVE_NETINET_IN_H 1

8 -#define APR_HAVE_NETINET_SCTP_H 1

9 +#define APR_HAVE_NETINET_SCTP_H 0

10 #define APR_HAVE_NETINET_SCTP_UIO_H 0

11 #define APR_HAVE_NETINET_TCP_H 1

12 #define APR_HAVE_PROCESS_H 0

13 @@ -220,19 +220,19 @@

14 #define APR_USE_SHMEM_MMAP_SHM 0

15 #define APR_USE_SHMEM_MMAP_ZERO 0

16 #define APR_USE_SHMEM_SHMGET_ANON 0

17 -#define APR_USE_SHMEM_SHMGET 1

18 +#define APR_USE_SHMEM_SHMGET 0

19 #define APR_USE_SHMEM_MMAP_ANON 1

20 #define APR_USE_SHMEM_BEOS 0

21

22 #define APR_USE_FLOCK_SERIALIZE 0

23 -#define APR_USE_SYSVSEM_SERIALIZE 1

24 +#define APR_USE_SYSVSEM_SERIALIZE 0

25 #define APR_USE_POSIXSEM_SERIALIZE 0

26 #define APR_USE_FCNTL_SERIALIZE 0

27 #define APR_USE_PROC_PTHREAD_SERIALIZE 0

28 #define APR_USE_PTHREAD_SERIALIZE 1

29

30 #define APR_HAS_FLOCK_SERIALIZE 1

31 -#define APR_HAS_SYSVSEM_SERIALIZE 1

32 +#define APR_HAS_SYSVSEM_SERIALIZE 0

33 #define APR_HAS_POSIXSEM_SERIALIZE 1

34 #define APR_HAS_FCNTL_SERIALIZE 1

35 #define APR_HAS_PROC_PTHREAD_SERIALIZE 1

36 @@ -260,7 +260,7 @@

37 #define APR_HAVE_MEMCHR 1

38 #define APR_HAVE_STRUCT_RLIMIT 1

39 #define APR_HAVE_UNION_SEMUN 0

40 -#define APR_HAVE_SCTP 1

41 +#define APR_HAVE_SCTP 0

42 #define APR_HAVE_IOVEC 1

43

44 /* APR Feature Macros */

45 @@ -278,7 +278,7 @@

46 #define APR_HAS_USER 1

47 #define APR_HAS_LARGE_FILES 0

48 #define APR_HAS_XTHREAD_FILES 0

49 -#define APR_HAS_OS_UUID 1

50 +#define APR_HAS_OS_UUID 0

51

52 #define APR_PROCATTR_USER_SET_REQUIRES_PASSWORD 0

53

54 @@ -349,8 +349,8 @@

55 #define UINT64_C(v) (v ## ULL)

56 #endif

57 #else

58 - typedef long apr_int64_t;

59 - typedef unsigned long apr_uint64_t;

60 + typedef long long apr_int64_t;

61 + typedef unsigned long long apr_uint64_t;

62 #endif

63

64 typedef size_t apr_size_t;

65 diff -ruN ./original/include/arch/netware/DEPS ./changed/include/arch/netware/DE PS

66 --- ./original/include/arch/netware/DEPS 1969-12-31 19:00:00.000000000 -0 500

67 +++ ./changed/include/arch/netware/DEPS 2016-01-04 10:18:31.705765573 -0500

68 @@ -0,0 +1,3 @@

69 +include_rules = [

70 + '+../original/apr_private_common.h',

71 +]

72 diff -ruN ./original/include/arch/unix/apr_private.h ./changed/include/arch/unix /apr_private.h

73 --- ./original/include/arch/unix/apr_private.h 2016-01-04 13:12:47.193357456 -0 500

74 +++ ./changed/include/arch/unix/apr_private.h 2016-01-04 10:18:31.705765573 -0 500

75 @@ -31,7 +31,7 @@

76 #define DEV_RANDOM "/dev/urandom"

77

78 /* Define if struct dirent has an inode member */

79 -#define DIRENT_INODE d_fileno

80 +/* #define DIRENT_INODE d_fileno */

81

82 /* Define if struct dirent has a d_type member */

83 #define DIRENT_TYPE d_type

84 @@ -73,7 +73,7 @@

85 /* #undef GETSERVBYNAME_IS_THREAD_SAFE */

86

87 /* Define if getservbyname_r has the glibc style */

88 -#define GETSERVBYNAME_R_GLIBC2 1

89 +/* #define GETSERVBYNAME_R_GLIBC2 1 */

90

91 /* Define if getservbyname_r has the OSF/1 style */

92 /* #undef GETSERVBYNAME_R_OSF1 */

93 @@ -82,7 +82,7 @@

94 /* #undef GETSERVBYNAME_R_SOLARIS */

95

96 /* Define if accept4 function is supported */

97 -#define HAVE_ACCEPT4 1

98 +/* #define HAVE_ACCEPT4 1 */

99

100 /* Define if async i/o supports message q's */

101 /* #undef HAVE_AIO_MSGQ */

102 @@ -141,7 +141,7 @@

103 /* #undef HAVE_DL_H */

104

105 /* Define if dup3 function is supported */

106 -#define HAVE_DUP3 1

107 +/* #define HAVE_DUP3 1 */

108

109 /* Define if EGD is supported */

110 /* #undef HAVE_EGD */

111 @@ -150,7 +150,7 @@

112 #define HAVE_EPOLL 1

113

114 /* Define if epoll_create1 function is supported */

115 -#define HAVE_EPOLL_CREATE1 1

116 +/* #define HAVE_EPOLL_CREATE1 1 */

117

118 /* Define to 1 if you have the <errno.h> header file. */

119 #define HAVE_ERRNO_H 1

120 @@ -195,13 +195,13 @@

121 #define HAVE_GETHOSTBYNAME_R 1

122

123 /* Define to 1 if you have the `getifaddrs' function. */

124 -#define HAVE_GETIFADDRS 1

125 +/* #define HAVE_GETIFADDRS 1 */

126

127 /* Define if getnameinfo exists */

128 #define HAVE_GETNAMEINFO 1

129

130 /* Define to 1 if you have the `getpass' function. */

131 -#define HAVE_GETPASS 1

132 +/* #define HAVE_GETPASS 1 */

133

134 /* Define to 1 if you have the `getpassphrase' function. */

135 /* #undef HAVE_GETPASSPHRASE */

136 @@ -318,7 +318,7 @@

137 /* #undef HAVE_NET_ERRNO_H */

138

139 /* Define to 1 if you have the `nl_langinfo' function. */

140 -#define HAVE_NL_LANGINFO 1

141 +/* #define HAVE_NL_LANGINFO 1 */

142

143 /* Define to 1 if you have the <os2.h> header file. */

144 /* #undef HAVE_OS2_H */

145 @@ -360,7 +360,7 @@

146 #define HAVE_PTHREAD_MUTEX_RECURSIVE 1

147

148 /* Define if cross-process robust mutexes are available */

149 -#define HAVE_PTHREAD_MUTEX_ROBUST 1

150 +/* #define HAVE_PTHREAD_MUTEX_ROBUST 1 */

151

152 /* Define if PTHREAD_PROCESS_SHARED is defined in pthread.h */

153 #define HAVE_PTHREAD_PROCESS_SHARED 1

154 @@ -372,7 +372,7 @@

155 #define HAVE_PTHREAD_RWLOCK_INIT 1

156

157 /* Define to 1 if you have the `pthread_yield' function. */

158 -#define HAVE_PTHREAD_YIELD 1

159 +/* #define HAVE_PTHREAD_YIELD 1 */

160

161 /* Define to 1 if you have the `putenv' function. */

162 #define HAVE_PUTENV 1

163 @@ -474,7 +474,7 @@

164 #define HAVE_SOCKLEN_T 1

165

166 /* Define if the SOCK_CLOEXEC flag is supported */

167 -#define HAVE_SOCK_CLOEXEC 1

168 +/* #define HAVE_SOCK_CLOEXEC 1 */

169

170 /* Define if SO_ACCEPTFILTER is defined in sys/socket.h */

171 /* #undef HAVE_SO_ACCEPTFILTER */

172 @@ -531,7 +531,7 @@

173 /* #undef HAVE_STRUCT_STAT_ST_ATIME_N */

174

175 /* Define to 1 if `st_atim.tv_nsec' is a member of `struct stat'. */

176 -#define HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC 1

177 +/* #define HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC 0 */

178

179 /* Define to 1 if `st_blocks' is a member of `struct stat'. */

180 #define HAVE_STRUCT_STAT_ST_BLOCKS 1

181 @@ -543,7 +543,7 @@

182 /* #undef HAVE_STRUCT_STAT_ST_CTIME_N */

183

184 /* Define to 1 if `st_ctim.tv_nsec' is a member of `struct stat'. */

185 -#define HAVE_STRUCT_STAT_ST_CTIM_TV_NSEC 1

186 +/* #define HAVE_STRUCT_STAT_ST_CTIM_TV_NSEC 1 */

187

188 /* Define to 1 if `st_mtimensec' is a member of `struct stat'. */

189 /* #undef HAVE_STRUCT_STAT_ST_MTIMENSEC */

190 @@ -552,7 +552,7 @@

191 /* #undef HAVE_STRUCT_STAT_ST_MTIME_N */

192

193 /* Define to 1 if `st_mtim.tv_nsec' is a member of `struct stat'. */

194 -#define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1

195 +/* #define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1 */

196

197 /* Define to 1 if `tm_gmtoff' is a member of `struct tm'. */

198 #define HAVE_STRUCT_TM_TM_GMTOFF 1

199 @@ -594,13 +594,13 @@

200 #define HAVE_SYS_SELECT_H 1

201

202 /* Define to 1 if you have the <sys/sem.h> header file. */

203 -#define HAVE_SYS_SEM_H 1

204 +/* #define HAVE_SYS_SEM_H 1 */

205

206 /* Define to 1 if you have the <sys/sendfile.h> header file. */

207 #define HAVE_SYS_SENDFILE_H 1

208

209 /* Define to 1 if you have the <sys/shm.h> header file. */

210 -#define HAVE_SYS_SHM_H 1

211 +/* #define HAVE_SYS_SHM_H 1 */

212

213 /* Define to 1 if you have the <sys/signal.h> header file. */

214 #define HAVE_SYS_SIGNAL_H 1

215 @@ -633,7 +633,7 @@

216 #define HAVE_SYS_UN_H 1

217

218 /* Define to 1 if you have the <sys/uuid.h> header file. */

219 -/* #undef HAVE_SYS_UUID_H */

220 +#undef HAVE_SYS_UUID_H

221

222 /* Define to 1 if you have the <sys/wait.h> header file. */

223 #define HAVE_SYS_WAIT_H 1

224 @@ -687,7 +687,7 @@

225 /* #undef HAVE_UUID_H */

226

227 /* Define to 1 if you have the <uuid/uuid.h> header file. */

228 -#define HAVE_UUID_UUID_H 1

229 +/* #define HAVE_UUID_UUID_H 1 */

230

231 /* Define if C compiler supports VLA */

232 #define HAVE_VLA 1

233

234

OLD	NEW

« no previous file with comments | « third_party/apache-portable-runtime/apr.gyp ('k') | third_party/netty-tcnative/LICENSE » ('j') | no next file with comments »