diff options
author | Alexander Gluzsky <sss123next@list.ru> | 2012-10-16 16:54:11 +0000 |
---|---|---|
committer | Alexander Gluzsky <sss123next@list.ru> | 2012-10-16 16:54:11 +0000 |
commit | c5a519e8b20fd2c1e307de53233ad19ef300bcbb (patch) | |
tree | c1a26d5f0f58ce9edfda5a8d4d6b610174481e9c /plugins/!NotAdopted/Skype/ezxml | |
parent | 9213250ec9491ae5c8a9a6c389a7678eca8de4b7 (diff) |
skype adaptation
git-svn-id: http://svn.miranda-ng.org/main/trunk@1957 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/!NotAdopted/Skype/ezxml')
-rwxr-xr-x[-rw-r--r--] | plugins/!NotAdopted/Skype/ezxml/ezxml.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/plugins/!NotAdopted/Skype/ezxml/ezxml.c b/plugins/!NotAdopted/Skype/ezxml/ezxml.c index 24c02fbd70..7f8f5ea17d 100644..100755 --- a/plugins/!NotAdopted/Skype/ezxml/ezxml.c +++ b/plugins/!NotAdopted/Skype/ezxml/ezxml.c @@ -21,36 +21,36 @@ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -
-#if defined(WIN32) || defined(_WIN32)
-#include <io.h>
-#ifndef EZXML_NOMMAP
-#define EZXML_NOMMAP
-#endif
-#endif
+ +#if defined(WIN32) || defined(_WIN32) +#include <io.h> +#ifndef EZXML_NOMMAP +#define EZXML_NOMMAP +#endif +#endif #include <stdlib.h> #include <stdio.h> #include <stdarg.h> #include <string.h> -#include <ctype.h>
+#include <ctype.h> #if !defined(WIN32) && !defined(_WIN32) -#include <unistd.h>
+#include <unistd.h> #endif #include <sys/types.h> #ifndef EZXML_NOMMAP #include <sys/mman.h> #endif // EZXML_NOMMAP #include <sys/stat.h> -#include "ezxml.h"
-
-#if defined(WIN32) || defined(_WIN32)
-#define vsnprintf _vsnprintf
-#define snprintf _snprintf
-#define open _open
-#define read _read
-#define write _write
-#define close _close
+#include "ezxml.h" + +#if defined(WIN32) || defined(_WIN32) +#define vsnprintf _vsnprintf +#define snprintf _snprintf +#define open _open +#define read _read +#define write _write +#define close _close #endif #define EZXML_WS "\t\r\n " // whitespace @@ -322,7 +322,7 @@ void ezxml_proc_inst(ezxml_root_t root, char *s, size_t len) root->pi[i] = malloc(sizeof(char *) * 3); root->pi[i][0] = target; root->pi[i][1] = (char *)(root->pi[i + 1] = NULL); // terminate pi list - root->pi[i][2] = strdup(""); // empty document position list + root->pi[i][2] = _strdup(""); // empty document position list } while (root->pi[i][j]) j++; // find end of instruction list for this target @@ -943,7 +943,7 @@ ezxml_t ezxml_set_attr(ezxml_t xml, const char *name, const char *value) if (! value) return xml; // nothing to do if (xml->attr == EZXML_NIL) { // first attribute xml->attr = malloc(4 * sizeof(char *)); - xml->attr[1] = strdup(""); // empty list of malloced names/vals + xml->attr[1] = _strdup(""); // empty list of malloced names/vals } else xml->attr = realloc(xml->attr, (l + 4) * sizeof(char *)); |