Skip to content

Commit 5709e0b

Browse files
committed
Revert "Use PW32IO instead of PHP_API to export symbols"
This reverts commit 3f42b8a.
1 parent 3f42b8a commit 5709e0b

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

win32/glob.c

+8-5
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,14 @@
6262
#include "glob.h"
6363
#include <stdbool.h>
6464
#include <stdint.h>
65-
#include "ioutil.h"
66-
#include "readdir.h"
65+
#include <sys/stat.h>
6766

67+
#include <ctype.h>
6868
#include <errno.h>
69-
#include <string.h> /* For strcmp() */
69+
#include <stdio.h>
70+
#include <stdlib.h>
71+
#include <string.h>
72+
#include "php.h"
7073

7174
#define DOLLAR '$'
7275
#define DOT '.'
@@ -139,7 +142,7 @@ static bool match(Char *, Char *, Char *);
139142
static void qprintf(const char *, Char *);
140143
#endif
141144

142-
PW32IO int glob(const char *pattern, int flags, int (*errfunc)(const char *, int), glob_t *pglob)
145+
PHPAPI int glob(const char *pattern, int flags, int (*errfunc)(const char *, int), glob_t *pglob)
143146
{
144147
const uint8_t *patnext;
145148
int c;
@@ -726,7 +729,7 @@ static bool match(Char *name, Char *pat, Char *patend)
726729
}
727730

728731
/* Free allocated data belonging to a glob_t structure. */
729-
PW32IO void globfree(glob_t *pglob)
732+
PHPAPI void globfree(glob_t *pglob)
730733
{
731734
register int i;
732735
register char **pp;

win32/glob.h

+2-3
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
#define _GLOB_H_
4444

4545
#include <stddef.h>
46-
#include "ioutil.h"
4746

4847
typedef struct {
4948
size_t gl_pathc; /* Count of total paths so far. */
@@ -77,7 +76,7 @@ typedef struct {
7776
#define GLOB_NOMATCH (-3) /* No match and GLOB_NOCHECK not set. */
7877

7978
BEGIN_EXTERN_C()
80-
PW32IO int glob(const char *, int, int (*)(const char *, int), glob_t *);
81-
PW32IO void globfree(glob_t *);
79+
PHPAPI int glob(const char *, int, int (*)(const char *, int), glob_t *);
80+
PHPAPI void globfree(glob_t *);
8281
END_EXTERN_C()
8382
#endif /* !_GLOB_H_ */

0 commit comments

Comments
 (0)