Changeset 123 for Mulberry/branches/win32-merge-121/Plug-ins/CommunicatorAdbkIO/sources/CCommAdbkIOPluginDLL.cp

Timestamp:

11/18/07 21:04:49 (1 year ago)

Author:

daboo

Message:

Win32 VCPP changes.

Files:

• Mulberry/branches/win32-merge-121/Plug-ins/CommunicatorAdbkIO/sources/CCommAdbkIOPluginDLL.cp (modified) (3 diffs)

Mulberry/branches/win32-merge-121/Plug-ins/CommunicatorAdbkIO/sources/CCommAdbkIOPluginDLL.cp

@@ -46 +46 @@
 #endif
 
+#ifdef __VCPP__
+#define LDAP_UNICODE 0
+#include <winldap.h>
+#define LDAP_CONST const
+#define LDIF_PUT_VALUE 1
+#define ber_len_t size_t
+int
+ldif_parse_line(
+    LDAP_CONST char     *line,
+    char        **typep,
+    char        **valuep,
+    ber_len_t *vlenp
+);
+char *
+ldif_getline( char **next );
+char *
+ldif_put(
+        int type,
+        LDAP_CONST char *name,
+        LDAP_CONST char *val,
+        ber_len_t vlen );
+#else
 #define NEEDPROTOS
 #include <lber.h>
@@ -52 +74 @@
 #else
 #include <ldif.h>
+#endif
 #endif
 #include <string.h>
@@ -533 +556 @@
                 const char *q = ::strrchr(*p, ' ');
                 cdstring email = (q ? q + 1 : *p);
-                if (email[0UL] == '<')
+                if (email[(cdstring::size_type)0] == '<')
                         email = cdstring(&email.c_str()[1], email.length() - 2);
                 cdstring name = (q ? cdstring(*p, q - *p) : cdstring::null_str);