Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

fix Nmakefile (from Ramiro Morales)

  • Loading branch information...
commit 74550f8678f675d413ea6131ef541661cfa11eb5 1 parent c33c616
freddy77 authored
Showing with 8 additions and 6 deletions.
  1. +5 −1 ChangeLog
  2. +1 −3 Nmakefile
  3. +2 −2 include/replacements.h
View
6 ChangeLog
@@ -1,3 +1,7 @@
+Thu Jul 7 09:24:05 CEST 2011 Frediano Ziglio <freddy77_A_gmail_D_com>
+ * Nmakefile include/replacements.h:
+ - fix Nmakefile (from Ramiro Morales)
+
Sat Jul 2 09:53:21 CEST 2011 Frediano Ziglio <freddy77_A_gmail_D_com>
* src/tds/gssapi.c: minor changes
@@ -494,4 +498,4 @@ Sat Apr 9 16:15:00 EDT 2011 JK Lowden <jklowden@freetds.org>
* ChangeLog-0.91 added because of release
$FreeTDS$
-$Id: ChangeLog,v 1.3314 2011/07/02 07:52:46 freddy77 Exp $
+$Id: ChangeLog,v 1.3315 2011/07/07 07:24:22 freddy77 Exp $
View
4 Nmakefile
@@ -1,4 +1,4 @@
-# $Id: Nmakefile,v 1.13 2011/06/29 13:07:28 freddy77 Exp $
+# $Id: Nmakefile,v 1.14 2011/07/07 07:24:22 freddy77 Exp $
# Build FreeTDS and assorted utilities for Win32/Win64 without an IDE.
# Makefiles, unlike Visual Studio project files, are stable over time.
# Contributed to the public domain by James K. Lowden, February 2009
@@ -89,7 +89,6 @@ TDS_SRC = $(TDS_DIR)\bulk.c \
$(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_OBJ = $(TDS_OUT)\bulk.obj \
$(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 \
View
4 include/replacements.h
@@ -20,7 +20,7 @@
#ifndef _replacements_h_
#define _replacements_h_
-/* $Id: replacements.h,v 1.29 2011/05/27 09:18:59 freddy77 Exp $ */
+/* $Id: replacements.h,v 1.30 2011/07/07 07:24:22 freddy77 Exp $ */
#include <stdarg.h>
#include "tds_sysdep_public.h"
@@ -59,8 +59,8 @@ extern "C"
#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, ...);
Please sign in to comment.
Something went wrong with that request. Please try again.