Changeset 315 for pjproject/trunk/pjlib/include/pj/compat/string.h

Timestamp:

Mar 10, 2006 12:57:12 PM (18 years ago)

Author:

bennylp

Message:

Fixed compilation and run warnings/errors with MSVC 2005

File:

• pjproject/trunk/pjlib/include/pj/compat/string.h (modified) (10 diffs)

pjproject/trunk/pjlib/include/pj/compat/string.h

@@ -27 +27 @@
 
 #if defined(PJ_HAS_STRING_H) && PJ_HAS_STRING_H != 0
-#  include <string.h>
+#   include <string.h>
 #else
 
@@ -36 +36 @@
 
 #if defined(_MSC_VER)
-#  define strcasecmp    stricmp
-#  if defined(PJ_WIN32_WINCE) && PJ_WIN32_WINCE!=0
+#   include <stdio.h>
+#   define strcasecmp   _stricmp
 #   define strncasecmp  _strnicmp
-#  else
-#   define strncasecmp  strnicmp
-#  endif
-#  define snprintf      _snprintf
-#  define snwprintf     _snwprintf
-#  define wcsicmp       _wcsicmp
-#  define wcsnicmp      _wcsnicmp
+#   define snprintf     _snprintf
+#   define vsnprintf    _vsnprintf
+#   define snwprintf    _snwprintf
+#   define wcsicmp      _wcsicmp
+#   define wcsnicmp     _wcsnicmp
 #else
-#  define stricmp       strcasecmp
-#  define strnicmp      strncasecmp
+#   define stricmp      strcasecmp
+#   define strnicmp     strncasecmp
 
-#  if defined(PJ_NATIVE_STRING_IS_UNICODE) && PJ_NATIVE_STRING_IS_UNICODE!=0
-#     error "Implement Unicode string functions"
-#  endif
+#   if defined(PJ_NATIVE_STRING_IS_UNICODE) && PJ_NATIVE_STRING_IS_UNICODE!=0
+#       error "Implement Unicode string functions"
+#   endif
 #endif
-
 
 #define pj_ansi_strcmp          strcmp
@@ -60 +57 @@
 #define pj_ansi_strlen          strlen
 #define pj_ansi_strcpy          strcpy
+#define pj_ansi_strncpy         strncpy
 #define pj_ansi_strcat          strcat
 #define pj_ansi_strstr          strstr
@@ -69 +67 @@
 #define pj_ansi_sprintf         sprintf
 #define pj_ansi_snprintf        snprintf
+#define pj_ansi_vsprintf        vsprintf
+#define pj_ansi_vsnprintf       vsnprintf
 
 #define pj_unicode_strcmp       wcscmp
@@ -74 +74 @@
 #define pj_unicode_strlen       wcslen
 #define pj_unicode_strcpy       wcscpy
+#define pj_unicode_strncpy      wcsncpy
 #define pj_unicode_strcat       wcscat
 #define pj_unicode_strstr       wcsstr
@@ -83 +84 @@
 #define pj_unicode_sprintf      swprintf
 #define pj_unicode_snprintf     snwprintf
-
+#define pj_unicode_vsprintf     vswprintf
+#define pj_unicode_vsnprintf    vsnwprintf
 
 #if defined(PJ_NATIVE_STRING_IS_UNICODE) && PJ_NATIVE_STRING_IS_UNICODE!=0
@@ -90 +92 @@
 #   define pj_native_strlen         pj_unicode_strlen
 #   define pj_native_strcpy         pj_unicode_strcpy
+#   define pj_native_strncpy        pj_unicode_strncpy
 #   define pj_native_strcat         pj_unicode_strcat
 #   define pj_native_strstr         pj_unicode_strstr
@@ -99 +102 @@
 #   define pj_native_sprintf        pj_unicode_sprintf
 #   define pj_native_snprintf       pj_unicode_snprintf
+#   define pj_native_vsprintf       pj_unicode_vsprintf
+#   define pj_native_vsnprintf      pj_unicode_vsnprintf
 #else
 #   define pj_native_strcmp         pj_ansi_strcmp
@@ -104 +109 @@
 #   define pj_native_strlen         pj_ansi_strlen
 #   define pj_native_strcpy         pj_ansi_strcpy
+#   define pj_native_strncpy        pj_ansi_strncpy
 #   define pj_native_strcat         pj_ansi_strcat
 #   define pj_native_strstr         pj_ansi_strstr
@@ -113 +119 @@
 #   define pj_native_sprintf        pj_ansi_sprintf
 #   define pj_native_snprintf       pj_ansi_snprintf
+#   define pj_native_vsprintf       pj_ansi_vsprintf
+#   define pj_native_vsnprintf      pj_ansi_vsnprintf
 #endif