myodbc.patch 2.1 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263
  1. Index: configure
  2. --- configure.orig 2007-05-04 04:55:25 +0200
  3. +++ configure 2007-05-08 09:33:10 +0200
  4. @@ -20846,7 +20846,7 @@
  5. echo $ECHO_N "(cached) $ECHO_C" >&6
  6. else
  7. ac_check_lib_save_LIBS=$LIBS
  8. -LIBS="-lodbcinst $LIBS"
  9. +LIBS="-lodbcinst -lodbc $LIBS"
  10. cat >conftest.$ac_ext <<_ACEOF
  11. /* confdefs.h. */
  12. _ACEOF
  13. Index: util/Makefile.in
  14. --- util/Makefile.in.orig 2007-07-13 21:48:15 +0200
  15. +++ util/Makefile.in 2007-07-18 07:07:36 +0200
  16. @@ -49,7 +49,8 @@
  17. @ODBCINSTLINK_TRUE@ MYODBCUtilReadDriver.c \
  18. @ODBCINSTLINK_TRUE@ MYODBCUtilWriteDataSource.c \
  19. @ODBCINSTLINK_TRUE@ MYODBCUtilWriteDataSourceStr.c \
  20. -@ODBCINSTLINK_TRUE@ MYODBCUtilWriteDriver.c
  21. +@ODBCINSTLINK_TRUE@ MYODBCUtilWriteDriver.c \
  22. +@ODBCINSTLINK_TRUE@ strndup.c
  23. subdir = util
  24. DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
  25. @@ -83,7 +84,8 @@
  26. @ODBCINSTLINK_TRUE@ MYODBCUtilReadDriver.lo \
  27. @ODBCINSTLINK_TRUE@ MYODBCUtilWriteDataSource.lo \
  28. @ODBCINSTLINK_TRUE@ MYODBCUtilWriteDataSourceStr.lo \
  29. -@ODBCINSTLINK_TRUE@ MYODBCUtilWriteDriver.lo
  30. +@ODBCINSTLINK_TRUE@ MYODBCUtilWriteDriver.lo \
  31. +@ODBCINSTLINK_TRUE@ strndup.lo
  32. am_libmyodbc3u_la_OBJECTS = MYODBCUtilAllocDataSource.lo \
  33. MYODBCUtilAllocDriver.lo MYODBCUtilClearDataSource.lo \
  34. MYODBCUtilClearDriver.lo MYODBCUtilDefaultDataSource.lo \
  35. @@ -348,6 +350,7 @@
  36. @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MYODBCUtilWriteDataSource.Plo@am__quote@
  37. @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MYODBCUtilWriteDataSourceStr.Plo@am__quote@
  38. @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MYODBCUtilWriteDriver.Plo@am__quote@
  39. +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strndup.Plo@am__quote@
  40. .c.o:
  41. @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
  42. Index: util/strndup.c
  43. --- /dev/null 2007-05-08 09:33:33 +0200
  44. +++ util/strndup.c 2007-05-08 09:28:45 +0200
  45. @@ -0,0 +1,15 @@
  46. +
  47. +#include <stdio.h>
  48. +
  49. +char *strndup(const char *src, size_t len)
  50. +{
  51. + char *dst;
  52. +
  53. + if (src == NULL)
  54. + return NULL;
  55. + if (dst = (char *)calloc(len + 1, sizeof(char)) == NULL)
  56. + return NULL;
  57. + strncpy(dst, src, len);
  58. + return dst;
  59. +}
  60. +