Skip to content

Commit 36fa7a7

Browse files
jmikolajmikola
committed
Merge pull request #70 
2 parents f72b71b + 7c7de06 commit 36fa7a7

File tree

3 files changed

+82
-82
lines changed

3 files changed

+82
-82
lines changed

‎config.m4

Lines changed: 80 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -109,13 +109,12 @@ if test "$MONGODB" != "no"; then
109109
PHP_CHECK_GCC_ARG(-Wempty-body, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wempty-body")
110110
PHP_CHECK_GCC_ARG(-Wparentheses, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wparentheses")
111111
PHP_CHECK_GCC_ARG(-Wdeclaration-after-statement, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wdeclaration-after-statement")
112-
dnl PHP_CHECK_GCC_ARG(-Werror, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Werror")
113112

114113
PHP_MONGODB_FOUND_VERSION=`${PHP_CONFIG} --version`
115114
PHP_MONGODB_FOUND_VERNUM=`echo "${PHP_MONGODB_FOUND_VERSION}" | $AWK 'BEGIN { FS = "."; } { printf "%d", ([$]1 * 100 + [$]2) * 100 + [$]3;}'`
116115

117116
if test "$PHP_MONGODB_FOUND_VERNUM" -ge "50400"; then
118-
PHP_CHECK_GCC_ARG(-Wno-cast-qual, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wno-cast-qual")
117+
PHP_CHECK_GCC_ARG(-Werror, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Werror")
119118
fi
120119

121120
MAINTAINER_CFLAGS="-Wextra $_MAINTAINER_CFLAGS -Wno-unused-parameter -Wno-unused-but-set-variable -Wno-missing-field-initializers"
@@ -188,92 +187,93 @@ if test "$MONGODB" != "no"; then
188187
";
189188

190189
YAJL_SOURCES="\
191-
yajl_version.c \
192-
yajl.c \
193-
yajl_encode.c \
194-
yajl_lex.c \
195-
yajl_parser.c \
196-
yajl_buf.c \
197-
yajl_tree.c \
198-
yajl_alloc.c \
199-
yajl_gen.c
190+
yajl_version.c \
191+
yajl.c \
192+
yajl_encode.c \
193+
yajl_lex.c \
194+
yajl_parser.c \
195+
yajl_buf.c \
196+
yajl_tree.c \
197+
yajl_alloc.c \
198+
yajl_gen.c
200199
";
201200

202201
BSON_SOURCES="\
203-
bcon.c \
204-
bson.c \
205-
bson-atomic.c \
206-
bson-clock.c \
207-
bson-context.c \
208-
bson-error.c \
209-
bson-iter.c \
210-
bson-iso8601.c \
211-
bson-json.c \
212-
bson-keys.c \
213-
bson-md5.c \
214-
bson-memory.c \
215-
bson-oid.c \
216-
bson-reader.c \
217-
bson-string.c \
218-
bson-timegm.c \
219-
bson-utf8.c \
220-
bson-value.c \
221-
bson-version.c \
222-
bson-writer.c
202+
bcon.c \
203+
bson.c \
204+
bson-atomic.c \
205+
bson-clock.c \
206+
bson-context.c \
207+
bson-error.c \
208+
bson-iter.c \
209+
bson-iso8601.c \
210+
bson-json.c \
211+
bson-keys.c \
212+
bson-md5.c \
213+
bson-memory.c \
214+
bson-oid.c \
215+
bson-reader.c \
216+
bson-string.c \
217+
bson-timegm.c \
218+
bson-utf8.c \
219+
bson-value.c \
220+
bson-version.c \
221+
bson-writer.c
223222
";
224223
MONGOC_SOURCES="\
225-
mongoc-array.c \
226-
mongoc-async.c \
227-
mongoc-async-cmd.c \
228-
mongoc-buffer.c \
229-
mongoc-bulk-operation.c \
230-
mongoc-b64.c \
231-
mongoc-client.c \
232-
mongoc-client-pool.c \
233-
mongoc-cluster.c \
234-
mongoc-collection.c \
235-
mongoc-counters.c \
236-
mongoc-cursor.c \
237-
mongoc-cursor-array.c \
238-
mongoc-cursor-transform.c \
239-
mongoc-cursor-cursorid.c \
240-
mongoc-database.c \
241-
mongoc-init.c \
242-
mongoc-gridfs.c \
243-
mongoc-gridfs-file.c \
244-
mongoc-gridfs-file-page.c \
245-
mongoc-gridfs-file-list.c \
246-
mongoc-index.c \
247-
mongoc-list.c \
248-
mongoc-log.c \
249-
mongoc-matcher-op.c \
250-
mongoc-matcher.c \
251-
mongoc-opcode.c \
252-
mongoc-queue.c \
253-
mongoc-read-prefs.c \
254-
mongoc-rpc.c \
255-
mongoc-set.c \
256-
mongoc-server-description.c \
257-
mongoc-socket.c \
258-
mongoc-stream.c \
259-
mongoc-stream-buffered.c \
260-
mongoc-stream-file.c \
261-
mongoc-stream-gridfs.c \
262-
mongoc-stream-socket.c \
263-
mongoc-topology.c \
264-
mongoc-topology-scanner.c \
265-
mongoc-topology-description.c \
266-
mongoc-uri.c \
267-
mongoc-util.c \
268-
mongoc-write-command.c \
269-
mongoc-write-concern.c
224+
mongoc-array.c \
225+
mongoc-async.c \
226+
mongoc-async-cmd.c \
227+
mongoc-buffer.c \
228+
mongoc-bulk-operation.c \
229+
mongoc-b64.c \
230+
mongoc-client.c \
231+
mongoc-client-pool.c \
232+
mongoc-cluster.c \
233+
mongoc-collection.c \
234+
mongoc-counters.c \
235+
mongoc-cursor.c \
236+
mongoc-cursor-array.c \
237+
mongoc-cursor-transform.c \
238+
mongoc-cursor-cursorid.c \
239+
mongoc-database.c \
240+
mongoc-init.c \
241+
mongoc-gridfs.c \
242+
mongoc-gridfs-file.c \
243+
mongoc-gridfs-file-page.c \
244+
mongoc-gridfs-file-list.c \
245+
mongoc-host-list.c \
246+
mongoc-index.c \
247+
mongoc-list.c \
248+
mongoc-log.c \
249+
mongoc-matcher-op.c \
250+
mongoc-matcher.c \
251+
mongoc-opcode.c \
252+
mongoc-queue.c \
253+
mongoc-read-prefs.c \
254+
mongoc-rpc.c \
255+
mongoc-set.c \
256+
mongoc-server-description.c \
257+
mongoc-socket.c \
258+
mongoc-stream.c \
259+
mongoc-stream-buffered.c \
260+
mongoc-stream-file.c \
261+
mongoc-stream-gridfs.c \
262+
mongoc-stream-socket.c \
263+
mongoc-topology.c \
264+
mongoc-topology-scanner.c \
265+
mongoc-topology-description.c \
266+
mongoc-uri.c \
267+
mongoc-util.c \
268+
mongoc-write-command.c \
269+
mongoc-write-concern.c
270270
";
271271

272272
MONGOC_SOURCES_SSL="\
273-
mongoc-rand.c \
274-
mongoc-scram.c \
275-
mongoc-stream-tls.c \
276-
mongoc-ssl.c
273+
mongoc-rand.c \
274+
mongoc-scram.c \
275+
mongoc-stream-tls.c \
276+
mongoc-ssl.c
277277
";
278278

279279
MONGOC_SOURCES_SASL=mongoc-sasl.c

‎config.w32

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ if (PHP_MONGODB != "no") {
1414
ADD_SOURCES(configure_module_dirname + "/src/contrib/", "php-ssl.c", "mongodb");
1515
ADD_SOURCES(configure_module_dirname + "/src/libbson/src/yajl", "yajl_version.c yajl.c yajl_encode.c yajl_lex.c yajl_parser.c yajl_buf.c yajl_tree.c yajl_alloc.c yajl_gen.c", "mongodb");
1616
ADD_SOURCES(configure_module_dirname + "/src/libbson/src/bson", "bcon.c bson.c bson-atomic.c bson-clock.c bson-context.c bson-error.c bson-iter.c bson-iso8601.c bson-json.c bson-keys.c bson-md5.c bson-memory.c bson-oid.c bson-reader.c bson-string.c bson-timegm.c bson-utf8.c bson-value.c bson-version.c bson-writer.c", "mongodb");
17-
ADD_SOURCES(configure_module_dirname + "/src/libmongoc/src/mongoc", "mongoc-array.c mongoc-async.c mongoc-async-cmd.c mongoc-buffer.c mongoc-bulk-operation.c mongoc-b64.c mongoc-client.c mongoc-client-pool.c mongoc-cluster.c mongoc-collection.c mongoc-counters.c mongoc-cursor.c mongoc-cursor-array.c mongoc-cursor-transform.c mongoc-cursor-cursorid.c mongoc-database.c mongoc-init.c mongoc-gridfs.c mongoc-gridfs-file.c mongoc-gridfs-file-page.c mongoc-gridfs-file-list.c mongoc-index.c mongoc-list.c mongoc-log.c mongoc-matcher-op.c mongoc-matcher.c mongoc-opcode.c mongoc-queue.c mongoc-read-prefs.c mongoc-rpc.c mongoc-set.c mongoc-server-description.c mongoc-socket.c mongoc-stream.c mongoc-stream-buffered.c mongoc-stream-file.c mongoc-stream-gridfs.c mongoc-stream-socket.c mongoc-topology.c mongoc-topology-scanner.c mongoc-topology-description.c mongoc-uri.c mongoc-util.c mongoc-write-command.c mongoc-write-concern.c", "mongodb");
17+
ADD_SOURCES(configure_module_dirname + "/src/libmongoc/src/mongoc", "mongoc-array.c mongoc-async.c mongoc-async-cmd.c mongoc-buffer.c mongoc-bulk-operation.c mongoc-b64.c mongoc-client.c mongoc-client-pool.c mongoc-cluster.c mongoc-collection.c mongoc-counters.c mongoc-cursor.c mongoc-cursor-array.c mongoc-cursor-transform.c mongoc-cursor-cursorid.c mongoc-database.c mongoc-init.c mongoc-gridfs.c mongoc-gridfs-file.c mongoc-gridfs-file-page.c mongoc-gridfs-file-list.c mongoc-host-list.c mongoc-index.c mongoc-list.c mongoc-log.c mongoc-matcher-op.c mongoc-matcher.c mongoc-opcode.c mongoc-queue.c mongoc-read-prefs.c mongoc-rpc.c mongoc-set.c mongoc-server-description.c mongoc-socket.c mongoc-stream.c mongoc-stream-buffered.c mongoc-stream-file.c mongoc-stream-gridfs.c mongoc-stream-socket.c mongoc-topology.c mongoc-topology-scanner.c mongoc-topology-description.c mongoc-uri.c mongoc-util.c mongoc-write-command.c mongoc-write-concern.c", "mongodb");
1818
ADD_SOURCES(configure_module_dirname + "/src/libmongoc/src/mongoc", "mongoc-rand.c mongoc-scram.c mongoc-stream-tls.c mongoc-ssl.c", "mongodb");
1919
ADD_SOURCES(configure_module_dirname + "/src/libmongoc/src/mongoc", "mongoc-sasl.c", "mongodb");
2020

‎src/libmongoc

Submodule libmongoc updated 125 files

0 commit comments

Comments
 (0)