aboutsummaryrefslogtreecommitdiffstats
path: root/util-src
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2008-11-29 15:14:59 +0000
committerMatthew Wild <mwild1@gmail.com>2008-11-29 15:14:59 +0000
commit7a2c71b1b5bb4d6f5de542dc09e4f56a95f5db46 (patch)
tree411383dacac42fe751da5c898927a08198537034 /util-src
parent428e9e1313cf9f935298b903adb2214d2b339f11 (diff)
parente20fe5e4675cb489a24664b8d465e6c445077ed9 (diff)
downloadprosody-7a2c71b1b5bb4d6f5de542dc09e4f56a95f5db46.tar.gz
prosody-7a2c71b1b5bb4d6f5de542dc09e4f56a95f5db46.zip
Merfe from Tobias
Diffstat (limited to 'util-src')
-rw-r--r--util-src/encodings.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/util-src/encodings.c b/util-src/encodings.c
index ac24ebcf..5fe2c805 100644
--- a/util-src/encodings.c
+++ b/util-src/encodings.c
@@ -7,19 +7,17 @@
#define _CRT_SECURE_NO_DEPRECATE
#include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
#include "lua.h"
#include "lauxlib.h"
/***************** BASE64 *****************/
-#define uint unsigned int
-
static const char code[]=
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-static void base64_encode(luaL_Buffer *b, uint c1, uint c2, uint c3, int n)
+static void base64_encode(luaL_Buffer *b, unsigned int c1, unsigned int c2, unsigned int c3, int n)
{
unsigned long tuple=c3+256UL*(c2+256UL*c1);
int i;