Skip to content

Commit da12a6d

Browse files
committed
Use PW32IO instead of PHP_API to export symbols
1 parent 52f8d84 commit da12a6d

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

win32/glob.c

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

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

7471
#define DOLLAR '$'
7572
#define DOT '.'
@@ -142,7 +139,7 @@ static bool match(Char *, Char *, Char *);
142139
static void qprintf(const char *, Char *);
143140
#endif
144141

145-
PHPAPI int glob(const char *pattern, int flags, int (*errfunc)(const char *, int), glob_t *pglob)
142+
PW32IO int glob(const char *pattern, int flags, int (*errfunc)(const char *, int), glob_t *pglob)
146143
{
147144
const uint8_t *patnext;
148145
int c;
@@ -729,7 +726,7 @@ static bool match(Char *name, Char *pat, Char *patend)
729726
}
730727

731728
/* Free allocated data belonging to a glob_t structure. */
732-
PHPAPI void globfree(glob_t *pglob)
729+
PW32IO void globfree(glob_t *pglob)
733730
{
734731
register int i;
735732
register char **pp;

win32/glob.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ typedef struct {
7676
#define GLOB_NOMATCH (-3) /* No match and GLOB_NOCHECK not set. */
7777

7878
BEGIN_EXTERN_C()
79-
PHPAPI int glob(const char *, int, int (*)(const char *, int), glob_t *);
80-
PHPAPI void globfree(glob_t *);
79+
PW32IO int glob(const char *, int, int (*)(const char *, int), glob_t *);
80+
PW32IO void globfree(glob_t *);
8181
END_EXTERN_C()
8282
#endif /* !_GLOB_H_ */

0 commit comments

Comments
 (0)