Re: win32 build, ptw32_mcs_lock.{c,obj} in Nmakefile
Frediano Ziglio <[email protected]>
| Newsgroups | gmane.comp.db.tds.freetds |
|---|---|
| Message-ID | <CAHt6W4ep-AxhiPAxK+A6BPgdDGFyNc1LmsfNQW9yyfrjTpr+ng@mail.gmail.com> |
2011/7/6 Ramiro Morales <[email protected]>: > Hi all, > > Doing a build of the latest 0.91RC under win32 using > the Nmakefile I get failures when it's trying to build > the ptw32_MCS_lock.c. > > But that file is #include'd (from src/tds/win_mutex.c) so no > compilation nor linking should be performed for it, if I've > understood things correctly. > > This simple patch fixed the issue: > > diff -u -r1.10.2.1 Nmakefile > --- Nmakefile 29 Jun 2011 13:09:58 -0000 1.10.2.1 > +++ Nmakefile 5 Jul 2011 22:12:13 -0000 > @@ -89,7 +89,6 @@ > $(TDS_DIR)\mem.c \ > $(TDS_DIR)\net.c \ > $(TDS_DIR)\numeric.c \ > - $(TDS_DIR)\ptw32_MCS_lock.c \ > $(TDS_DIR)\query.c \ > $(TDS_DIR)\read.c \ > $(TDS_DIR)\sspi.c \ > @@ -120,7 +119,6 @@ > $(TDS_OUT)\mem.obj \ > $(TDS_OUT)\net.obj \ > $(TDS_OUT)\numeric.obj \ > - $(TDS_OUT)\ptw32_MCS_lock.obj \ > $(TDS_OUT)\query.obj \ > $(TDS_OUT)\read.obj \ > $(TDS_OUT)\sspi.obj \ > > Also, this other small patch cosmetic tweak: > > diff -u -b -r1.28 replacements.h > --- include/replacements.h 18 Aug 2010 11:27:47 -0000 1.28 > +++ include/replacements.h 5 Jul 2011 21:29:10 -0000 > @@ -59,8 +59,8 @@ > #define vsnprintf _vsnprintf > #else > int vsnprintf(char *ret, size_t max, const char *fmt, va_list ap); > -#endif /* HAVE_VSNPRINTF */ > #endif /* !HAVE__VSNPRINTF */ > +#endif /* HAVE_VSNPRINTF */ > > #if !HAVE_ASPRINTF > int asprintf(char **ret, const char *fmt, ...); > > -- > Ramiro Morales Committed. Thanks _______________________________________________ FreeTDS mailing list [email protected] http://lists.ibiblio.org/mailman/listinfo/freetds