Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitfa9c0ff

Browse files
author
Bryan Henderson
committed
Remove __P macro usage so it compiles without cdefs.h.
1 parent9fc7250 commitfa9c0ff

File tree

3 files changed

+62
-50
lines changed

3 files changed

+62
-50
lines changed

‎src/backend/regex/engine.c

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,23 @@ extern "C" {
9090
#endif
9191

9292
/* === engine.c === */
93-
staticintmatcher__P((structre_guts*g,char*string,size_tnmatch,regmatch_tpmatch[],inteflags));
94-
staticchar*dissect__P((structmatch*m,char*start,char*stop,sopnostartst,sopnostopst));
95-
staticchar*backref__P((structmatch*m,char*start,char*stop,sopnostartst,sopnostopst,sopnolev));
96-
staticchar*fast__P((structmatch*m,char*start,char*stop,sopnostartst,sopnostopst));
97-
staticchar*slow__P((structmatch*m,char*start,char*stop,sopnostartst,sopnostopst));
98-
staticstatesstep__P((structre_guts*g,sopnostart,sopnostop,statesbef,intch,statesaft));
93+
staticint
94+
matcher(structre_guts*g,char*string,size_tnmatch,
95+
regmatch_tpmatch[],inteflags);
96+
staticchar*
97+
dissect(structmatch*m,char*start,char*stop,
98+
sopnostartst,sopnostopst);
99+
staticchar*
100+
backref(structmatch*m,char*start,char*stop,
101+
sopnostartst,sopnostopst,sopnolev);
102+
staticchar*
103+
fast(structmatch*m,char*start,char*stop,
104+
sopnostartst,sopnostopst);
105+
staticchar*
106+
slow(structmatch*m,char*start,char*stop,sopnostartst,sopnostopst);
107+
staticstates
108+
step(structre_guts*g,sopnostart,
109+
sopnostop,statesbef,intch,statesaft);
99110
#defineBOL(OUT+1)
100111
#defineEOL(BOL+1)
101112
#defineBOLEOL(BOL+2)
@@ -106,13 +117,17 @@ static states step __P((struct re_guts *g, sopno start, sopno stop, states bef,
106117
#defineNONCHAR(c)((c) > CHAR_MAX)
107118
#defineNNONCHAR(CODEMAX-CHAR_MAX)
108119
#ifdefREDEBUG
109-
staticvoidprint__P((structmatch*m,char*caption,statesst,intch,FILE*d));
120+
staticvoid
121+
print(structmatch*m,char*caption,statesst,intch,FILE*d);
110122
#endif
111123
#ifdefREDEBUG
112-
staticvoidat__P((structmatch*m,char*title,char*start,char*stop,sopnostartst,sopnostopst));
124+
staticvoid
125+
at(structmatch*m,char*title,char*start,char*stop,
126+
sopnostartst,sopnostopst);
113127
#endif
114128
#ifdefREDEBUG
115-
staticchar*pchar__P((intch));
129+
staticchar*
130+
pchar(intch);
116131
#endif
117132

118133
#ifdef__cplusplus

‎src/backend/regex/regcomp.c

Lines changed: 37 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -79,46 +79,43 @@ extern "C" {
7979
#endif
8080

8181
/* === regcomp.c === */
82-
staticvoidp_ere__P((structparse*p,intstop));
83-
staticvoidp_ere_exp__P((structparse*p));
84-
staticvoidp_str__P((structparse*p));
85-
staticvoidp_bre__P((structparse*p,intend1,intend2));
86-
staticintp_simp_re__P((structparse*p,intstarordinary));
87-
staticintp_count__P((structparse*p));
88-
staticvoidp_bracket__P((structparse*p));
89-
staticvoidp_b_term__P((structparse*p,cset*cs));
90-
staticvoidp_b_cclass__P((structparse*p,cset*cs));
91-
staticvoidp_b_eclass__P((structparse*p,cset*cs));
92-
staticcharp_b_symbol__P((structparse*p));
93-
staticcharp_b_coll_elem__P((structparse*p,intendc));
94-
staticcharothercase__P((intch));
95-
staticvoidbothcases__P((structparse*p,intch));
96-
staticvoidordinary__P((structparse*p,intch));
97-
staticvoidnonnewline__P((structparse*p));
98-
staticvoidrepeat__P((structparse*p,sopnostart,intfrom,intto));
99-
staticintseterr__P((structparse*p,inte));
100-
staticcset*allocset__P((structparse*p));
101-
staticvoidfreeset__P((structparse*p,cset*cs));
102-
staticintfreezeset__P((structparse*p,cset*cs));
103-
staticintfirstch__P((structparse*p,cset*cs));
104-
staticintnch__P((structparse*p,cset*cs));
105-
staticvoidmcadd__P((structparse*p,cset*cs,char*cp));
106-
/* static void mcsub __P((cset *cs, char *cp)); */
107-
/*static int mcin __P((cset *cs, char *cp));*/
108-
/*static char *mcfind __P((cset *cs, char *cp)); */
109-
staticvoidmcinvert__P((structparse*p,cset*cs));
110-
staticvoidmccase__P((structparse*p,cset*cs));
111-
staticintisinsets__P((structre_guts*g,intc));
112-
staticintsamesets__P((structre_guts*g,intc1,intc2));
113-
staticvoidcategorize__P((structparse*p,structre_guts*g));
114-
staticsopnodupl__P((structparse*p,sopnostart,sopnofinish));
115-
staticvoiddoemit__P((structparse*p,sopop,size_topnd));
116-
staticvoiddoinsert__P((structparse*p,sopop,size_topnd,sopnopos));
117-
staticvoiddofwd__P((structparse*p,sopnopos,sopvalue));
118-
staticvoidenlarge__P((structparse*p,sopnosize));
119-
staticvoidstripsnug__P((structparse*p,structre_guts*g));
120-
staticvoidfindmust__P((structparse*p,structre_guts*g));
121-
staticsopnopluscount__P((structparse*p,structre_guts*g));
82+
staticvoidp_ere(structparse*p,intstop);
83+
staticvoidp_ere_exp(structparse*p);
84+
staticvoidp_str(structparse*p);
85+
staticvoidp_bre(structparse*p,intend1,intend2);
86+
staticintp_simp_re(structparse*p,intstarordinary);
87+
staticintp_count(structparse*p);
88+
staticvoidp_bracket(structparse*p);
89+
staticvoidp_b_term(structparse*p,cset*cs);
90+
staticvoidp_b_cclass(structparse*p,cset*cs);
91+
staticvoidp_b_eclass(structparse*p,cset*cs);
92+
staticcharp_b_symbol(structparse*p);
93+
staticcharp_b_coll_elem(structparse*p,intendc);
94+
staticcharothercase(intch);
95+
staticvoidbothcases(structparse*p,intch);
96+
staticvoidordinary(structparse*p,intch);
97+
staticvoidnonnewline(structparse*p);
98+
staticvoidrepeat(structparse*p,sopnostart,intfrom,intto);
99+
staticintseterr(structparse*p,inte);
100+
staticcset*allocset(structparse*p);
101+
staticvoidfreeset(structparse*p,cset*cs);
102+
staticintfreezeset(structparse*p,cset*cs);
103+
staticintfirstch(structparse*p,cset*cs);
104+
staticintnch(structparse*p,cset*cs);
105+
staticvoidmcadd(structparse*p,cset*cs,char*cp);
106+
staticvoidmcinvert(structparse*p,cset*cs);
107+
staticvoidmccase(structparse*p,cset*cs);
108+
staticintisinsets(structre_guts*g,intc);
109+
staticintsamesets(structre_guts*g,intc1,intc2);
110+
staticvoidcategorize(structparse*p,structre_guts*g);
111+
staticsopnodupl(structparse*p,sopnostart,sopnofinish);
112+
staticvoiddoemit(structparse*p,sopop,size_topnd);
113+
staticvoiddoinsert(structparse*p,sopop,size_topnd,sopnopos);
114+
staticvoiddofwd(structparse*p,sopnopos,sopvalue);
115+
staticvoidenlarge(structparse*p,sopnosize);
116+
staticvoidstripsnug(structparse*p,structre_guts*g);
117+
staticvoidfindmust(structparse*p,structre_guts*g);
118+
staticsopnopluscount(structparse*p,structre_guts*g);
122119

123120
#ifdef__cplusplus
124121
}

‎src/backend/regex/regerror.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ extern "C" {
5858
#endif
5959

6060
/* === regerror.c === */
61-
staticchar*regatoi__P((constregex_t*preg,char*localbuf));
61+
staticchar*regatoi(constregex_t*preg,char*localbuf);
6262

6363
#ifdef__cplusplus
6464
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp