summaryrefslogtreecommitdiff
path: root/sal/inc/systools
diff options
context:
space:
mode:
authorHennes Rohling <hro@openoffice.org>2002-12-11 14:25:53 +0000
committerHennes Rohling <hro@openoffice.org>2002-12-11 14:25:53 +0000
commit99b9fd0d3f8b644039e874e4f882dd44e5d4424c (patch)
tree3a94285a3c251bcd1a38faeb417caad8019a931f /sal/inc/systools
parent8ec552a0cf65371de3022480d6609eac06736ba3 (diff)
#106038# Removed vsnprint due to cinflict with stlport
Diffstat (limited to 'sal/inc/systools')
-rw-r--r--sal/inc/systools/win32/snprintf.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/sal/inc/systools/win32/snprintf.h b/sal/inc/systools/win32/snprintf.h
index a456342f9652..254726e2f37b 100644
--- a/sal/inc/systools/win32/snprintf.h
+++ b/sal/inc/systools/win32/snprintf.h
@@ -64,11 +64,14 @@ _SNPRINTF_DLLIMPORT int __cdecl snwprintf( wchar_t *buffer, size_t count, const
/* SBCS and MBCS version */
_SNPRINTF_DLLIMPORT int __cdecl snprintf( char *buffer, size_t count, const char *format, ... );
+/* Conflict with STL_port inline implementation */
+#if 0
/* UNICODE version */
_SNPRINTF_DLLIMPORT int __cdecl vsnwprintf( wchar_t *buffer, size_t count, const wchar_t *format, va_list ap );
/* SBCS and MBCS version */
_SNPRINTF_DLLIMPORT int __cdecl vsnprintf( char *buffer, size_t count, const char *format, va_list ap );
+#endif
#ifdef __cplusplus
}