Re: svn commit: r1934273 - apr/apr/trunk/include
Ivan Zhakov <[email protected]> Sun, 17 May 2026 16:17:35 +0200
| Newsgroups | gmane.comp.apache.apr.devel |
|---|---|
| Message-ID | <CAPZho0_DQFeBoKw4H01m5ayd7Q_ZOCiJXKEYmUe53kR7Efan7A@mail.gmail.com> |
--0000000000003919790652041c09 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hi Steffen, Thank you for the information. But I am little bit confused: apr.hw is not used for CMake base build in APR. CMake uses include/apr.hwc. On Sat, 16 May 2026 at 20:17, Steffen <[email protected]> wrote: > We use in cmake : > > if !STATUS! =3D=3D 0 ( > rem Patch apr.hw - _WIN32_WINT to 0x600 series - needed for APR-ICONV > build. > perl -pi.bak -e ^" ^ > s~(#define _WIN32_WINNT ^)0x05\d\d$~${1}0x0600~; ^ > ^" include\apr.hw > > > Op 16 mei 2026 om 20:08 heeft [email protected] het volgende geschreven: > > =EF=BB=BFAuthor: ivan > Date: Sat May 16 18:06:53 2026 > New Revision: 1934273 > > Log: > Remove reference to apr.hnw and apr.hw from comments in apr.h.in and > apr.hwc. > > Modified: > apr/apr/trunk/include/apr.h.in > apr/apr/trunk/include/apr.hwc > > Modified: apr/apr/trunk/include/apr.h.in > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- apr/apr/trunk/include/apr.h.in Sat May 16 18:05:19 2026 > (r1934272) > +++ apr/apr/trunk/include/apr.h.in Sat May 16 18:06:53 2026 > (r1934273) > @@ -22,15 +22,14 @@ > * > * You must modify apr.h.in instead. > * > - * And please, make an effort to stub apr.hw and apr.hnw in the process. > + * And please, make an effort to stub apr.hwc in the process. > */ > > /** > * @file apr.h > * @brief APR Platform Definitions > * @remark This is a generated header generated from include/apr.h.in by > - * ./configure, or copied from include/apr.hw or include/apr.hnw > - * for Win32 or Netware by those build environments, respectively. > + * ./configure. > */ > > /** > > Modified: apr/apr/trunk/include/apr.hwc > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- apr/apr/trunk/include/apr.hwc Sat May 16 18:05:19 2026 (r193427= 2) > +++ apr/apr/trunk/include/apr.hwc Sat May 16 18:06:53 2026 (r193427= 3) > @@ -22,18 +22,14 @@ > * > * You must modify apr.hwc instead. > * > - * And please, make an effort to stub apr.hnw and apr.h.in in the > process. > - * > - * This is the Win32 specific version of apr.h. It is copied from > - * apr.hw by the apr.dsp and libapr.dsp projects. > + * And please, make an effort to stub apr.h.in in the process. > */ > > /** > * @file apr.h > * @brief APR Platform Definitions > - * @remark This is a generated header generated from include/apr.h.in by > - * ./configure, or copied from include/apr.hw or include/apr.hnw > - * for Win32 or Netware by those build environments, respectively. > + * @remark This is a generated header generated from include/apr.hwc by > + * CMake. > */ > > /* Make sure we have our platform identifier macro defined we ask for > later. > @@ -64,14 +60,6 @@ > #endif > > /** > - * @file apr.h > - * @brief APR Platform Definitions > - * @remark This is a generated header generated from include/apr.h.in by > - * ./configure, or copied from include/apr.hw or include/apr.hnw > - * for Win32 or Netware by those build environments, respectively. > - */ > - > -/** > * @defgroup APR Apache Portability Runtime library > * @{ > */ > > --=20 Ivan Zhakov --0000000000003919790652041c09 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable <div dir=3D"ltr"><div>Hi Steffen,</div><div><br></div><div>Thank you for th= e information.</div><div><br></div><div>But I am little bit confused: apr.h= w is not used for CMake base build in APR. CMake uses include/apr.hwc.=C2= =A0=C2=A0</div><br><div class=3D"gmail_quote gmail_quote_container"><div di= r=3D"ltr" class=3D"gmail_attr">On Sat, 16 May 2026 at 20:17, Steffen <<a= href=3D"mailto:[email protected]">[email protected]</a>> wrote:= <br></div><blockquote class=3D"gmail_quote" style=3D"margin:0px 0px 0px 0.8= ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir=3D"aut= o"><div dir=3D"ltr"></div><div dir=3D"ltr">We use in cmake :</div><div dir= =3D"ltr"><span style=3D"font-family:Courier,"Courier New",sans-se= rif;font-size:19px;background-color:rgb(250,250,250)"><br></span></div><div= dir=3D"ltr"><span style=3D"font-family:Courier,"Courier New",san= s-serif;font-size:19px;background-color:rgb(250,250,250)">if !STATUS! =3D= =3D 0 (</span><br style=3D"font-family:Courier,"Courier New",sans= -serif;background-color:rgb(250,250,250)"><span style=3D"font-family:Courie= r,"Courier New",sans-serif;font-size:19px;background-color:rgb(25= 0,250,250)">=C2=A0 =C2=A0 rem Patch apr.hw - _WIN32_WINT to 0x600 series - = needed for APR-ICONV build.</span><br style=3D"font-family:Courier,"Co= urier New",sans-serif;background-color:rgb(250,250,250)"><span style= =3D"font-family:Courier,"Courier New",sans-serif;font-size:19px;b= ackground-color:rgb(250,250,250)">=C2=A0 =C2=A0 perl -pi.bak -e ^" ^</= span><br style=3D"font-family:Courier,"Courier New",sans-serif;ba= ckground-color:rgb(250,250,250)"><span style=3D"font-family:Courier,"C= ourier New",sans-serif;font-size:19px;background-color:rgb(250,250,250= )">=C2=A0 =C2=A0 =C2=A0 s~(#define _WIN32_WINNT ^)0x05\d\d$~${1}0x0600~; ^<= /span><br style=3D"font-family:Courier,"Courier New",sans-serif;b= ackground-color:rgb(250,250,250)"><span style=3D"font-family:Courier,"= Courier New",sans-serif;font-size:19px;background-color:rgb(250,250,25= 0)">=C2=A0 =C2=A0 =C2=A0 ^" include\apr.hw</span></div><div dir=3D"ltr= "><br></div><div dir=3D"ltr"><br><blockquote type=3D"cite">Op 16 mei 2026 o= m 20:08 heeft <a href=3D"mailto:[email protected]" target=3D"_blank">ivan@apa= che.org</a> het volgende geschreven:<br><br></blockquote></div><blockquote = type=3D"cite"><div dir=3D"ltr">=EF=BB=BF<span>Author: ivan</span><br><span>= Date: Sat May 16 18:06:53 2026</span><br><span>New Revision: 1934273</span>= <br><span></span><br><span>Log:</span><br><span>Remove reference to apr.hnw= and apr.hw from comments in <a href=3D"http://apr.h.in" target=3D"_blank">= apr.h.in</a> and apr.hwc.</span><br><span></span><br><span>Modified:</span>= <br><span> =C2=A0=C2=A0apr/apr/trunk/include/<a href=3D"http://apr.h.in" ta= rget=3D"_blank">apr.h.in</a></span><br><span> =C2=A0=C2=A0apr/apr/trunk/inc= lude/apr.hwc</span><br><span></span><br><span>Modified: apr/apr/trunk/inclu= de/<a href=3D"http://apr.h.in" target=3D"_blank">apr.h.in</a></span><br><sp= an>=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D</span><br><span>--- apr/apr/trunk/include/<a href=3D"http://ap= r.h.in" target=3D"_blank">apr.h.in</a> =C2=A0 =C2=A0Sat May 16 18:05:19 202= 6 =C2=A0 =C2=A0(r1934272)</span><br><span>+++ apr/apr/trunk/include/<a href= =3D"http://apr.h.in" target=3D"_blank">apr.h.in</a> =C2=A0 =C2=A0Sat May 16= 18:06:53 2026 =C2=A0 =C2=A0(r1934273)</span><br><span>@@ -22,15 +22,14 @@<= /span><br><span> =C2=A0*</span><br><span> =C2=A0* You must modify <a href= =3D"http://apr.h.in" target=3D"_blank">apr.h.in</a> instead.</span><br><spa= n> =C2=A0*</span><br><span>- * And please, make an effort to stub apr.hw an= d apr.hnw in the process.</span><br><span>+ * And please, make an effort to= stub apr.hwc in the process.</span><br><span> =C2=A0*/</span><br><span></s= pan><br><span> /**</span><br><span> =C2=A0* @file apr.h</span><br><span> = =C2=A0* @brief APR Platform Definitions</span><br><span> =C2=A0* @remark Th= is is a generated header generated from include/<a href=3D"http://apr.h.in"= target=3D"_blank">apr.h.in</a> by</span><br><span>- * ./configure, or copi= ed from include/apr.hw or include/apr.hnw </span><br><span>- * for Win32 or= Netware by those build environments, respectively.</span><br><span>+ * ./c= onfigure.</span><br><span> =C2=A0*/</span><br><span></span><br><span> /**</= span><br><span></span><br><span>Modified: apr/apr/trunk/include/apr.hwc</sp= an><br><span>=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D</span><br><span>--- apr/apr/trunk/include/apr.hwc = =C2=A0 =C2=A0Sat May 16 18:05:19 2026 =C2=A0 =C2=A0(r1934272)</span><br><sp= an>+++ apr/apr/trunk/include/apr.hwc =C2=A0 =C2=A0Sat May 16 18:06:53 2026 = =C2=A0 =C2=A0(r1934273)</span><br><span>@@ -22,18 +22,14 @@</span><br><span= > =C2=A0*</span><br><span> =C2=A0* You must modify apr.hwc instead.</span><= br><span> =C2=A0*</span><br><span>- * And please, make an effort to stub ap= r.hnw and <a href=3D"http://apr.h.in" target=3D"_blank">apr.h.in</a> in the= process.</span><br><span>- *</span><br><span>- * This is the Win32 specifi= c version of apr.h.=C2=A0 It is copied from</span><br><span>- * apr.hw by t= he apr.dsp and libapr.dsp projects.</span><br><span>+ * And please, make an= effort to stub <a href=3D"http://apr.h.in" target=3D"_blank">apr.h.in</a> = in the process.</span><br><span> =C2=A0*/</span><br><span></span><br><span>= /**</span><br><span> =C2=A0* @file apr.h</span><br><span> =C2=A0* @brief A= PR Platform Definitions</span><br><span>- * @remark This is a generated hea= der generated from include/<a href=3D"http://apr.h.in" target=3D"_blank">ap= r.h.in</a> by</span><br><span>- * ./configure, or copied from include/apr.h= w or include/apr.hnw </span><br><span>- * for Win32 or Netware by those bui= ld environments, respectively.</span><br><span>+ * @remark This is a genera= ted header generated from include/apr.hwc by</span><br><span>+ * CMake.</sp= an><br><span> =C2=A0*/</span><br><span></span><br><span> /* Make sure we ha= ve our platform identifier macro defined we ask for later.</span><br><span>= @@ -64,14 +60,6 @@</span><br><span> #endif</span><br><span></span><br><span= > /**</span><br><span>- * @file apr.h</span><br><span>- * @brief APR Platfo= rm Definitions</span><br><span>- * @remark This is a generated header gener= ated from include/<a href=3D"http://apr.h.in" target=3D"_blank">apr.h.in</a= > by</span><br><span>- * ./configure, or copied from include/apr.hw or incl= ude/apr.hnw</span><br><span>- * for Win32 or Netware by those build environ= ments, respectively.</span><br><span>- */</span><br><span>-</span><br><span= >-/**</span><br><span> =C2=A0* @defgroup APR Apache Portability Runtime lib= rary</span><br><span> =C2=A0* @{</span><br><span> =C2=A0*/</span><br><span>= </span><br></div></blockquote></div></blockquote></div><div><br clear=3D"al= l"></div><br><span class=3D"gmail_signature_prefix">-- </span><br><div dir= =3D"ltr" class=3D"gmail_signature">Ivan Zhakov</div></div> --0000000000003919790652041c09--