Skip to content

Commit 6c45fce

Browse files
committed
- MFH: fix EOL broken by previous commit
1 parent d5f767c commit 6c45fce

File tree

1 file changed

+0
-45
lines changed

1 file changed

+0
-45
lines changed

ext/pdo_oci/config.w32

-45
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,46 @@
11
// $Id$
2-
32
// vim:ft=javascript
43

5-
6-
74
ARG_WITH("pdo-oci", "Oracle OCI support for PDO", "no");
85

9-
10-
116
if (PHP_PDO_OCI != "no") {
127

13-
14-
158
pdo_oci_dirs = new Array(
16-
179
PHP_PDO_OCI,
18-
1910
PHP_PDO_OCI + "\\oci",
20-
2111
PHP_PHP_BUILD + "\\instantclient10_*\\sdk",
22-
2312
PHP_PHP_BUILD + "\\oci92"
24-
2513
);
2614

27-
28-
2915
pdo_oci_lib_paths = "";
30-
3116
pdo_oci_inc_paths = "";
3217

33-
34-
3518
// find the oracle install
36-
3719
for (i = 0; i < pdo_oci_dirs.length; i++) {
38-
3920
pdo_oci_lib_paths += pdo_oci_dirs[i] + "\\lib;";
40-
4121
pdo_oci_lib_paths += pdo_oci_dirs[i] + "\\lib\\msvc;";
42-
4322
pdo_oci_inc_paths += pdo_oci_dirs[i] + "\\include;";
44-
4523
}
46-
4724

48-
4925
pdo_oci_inc_paths += PHP_PHP_BUILD + "\\include\\instantclient;"
50-
5126
pdo_oci_lib_paths += PHP_PHP_BUILD + "\\lib\\instantclient;";
5227

53-
54-
5528
pdo_oci_header = CHECK_HEADER_ADD_INCLUDE("oci.h", "CFLAGS_PDO_OCI", pdo_oci_inc_paths, null, null, true);
5629

57-
58-
5930
if (pdo_oci_header && CHECK_LIB("oci.lib", "pdo_oci", pdo_oci_lib_paths)) {
6031

61-
62-
6332
pdo_oci_inc_dir = FSO.GetParentFolderName(pdo_oci_header);
6433

65-
66-
6734
EXTENSION('pdo_oci', 'pdo_oci.c oci_driver.c oci_statement.c');
6835

69-
70-
7136
/* probe for some functions not present in older versions */
72-
7337
pdo_oci_inc_dir = FSO.GetFolder(pdo_oci_header);
74-
7538
CHECK_FUNC_IN_HEADER('oci.h', 'OCIEnvCreate', pdo_oci_inc_dir, 'CFLAGS_PDO_OCI');
76-
7739
CHECK_FUNC_IN_HEADER('ociap.h', 'OCIStmtFetch2', pdo_oci_inc_dir, 'CFLAGS_PDO_OCI');
78-
7940
CHECK_FUNC_IN_HEADER('ociap.h', 'OCIEnvNlsCreate', pdo_oci_inc_dir, 'CFLAGS_PDO_OCI');
8041

81-
82-
8342
} else {
84-
8543
WARNING("pdo-oci not enabled; libraries and headers not found");
86-
8744
}
88-
8945
ADD_EXTENSION_DEP('pdo_oci', 'pdo');
90-
9146
}

0 commit comments

Comments
 (0)