diff options
| author | TingPing <tingping@tingping.se> | 2013-01-17 15:50:26 -0800 |
|---|---|---|
| committer | TingPing <tingping@tingping.se> | 2013-01-17 15:50:26 -0800 |
| commit | de4b4afe9dbbe3a4b20b9ec7371b1ff6b738589b (patch) | |
| tree | 76004b5a0f7c340126f6ddbba78dd81da3aabebf /plugins | |
| parent | 8b451edf9c756a59196058d2f6cf2211bed5e60d (diff) | |
| parent | e43bc2ccc26c2090f65f1a2bbfda8ee4133c4806 (diff) | |
Merge pull request #380 from RichardHitt/pull350
Closes issue 350. Fix stat64 and malloc.h problems
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/checksum/checksum.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/plugins/checksum/checksum.c b/plugins/checksum/checksum.c index 08d62773..6eb85e77 100644 --- a/plugins/checksum/checksum.c +++ b/plugins/checksum/checksum.c @@ -23,9 +23,9 @@ #include <stdio.h> #include <string.h> #include <stdlib.h> -#include <malloc.h> #include <errno.h> #include <sys/types.h> +#include <sys/stat.h> #include <openssl/sha.h> #include <glib.h> @@ -33,9 +33,7 @@ #ifndef snprintf #define snprintf _snprintf #endif -#ifndef stat64 -#define stat64 _stat64 -#endif +#define stat _stat64 #else /* for INT_MAX */ #include <limits.h> @@ -44,8 +42,6 @@ #define _LARGEFILE64_SOURCE #endif -#include <sys/stat.h> - #include "hexchat-plugin.h" #define BUFSIZE 32768 @@ -172,7 +168,7 @@ static int dccrecv_cb (char *word[], void *userdata) { int result; - struct stat64 buffer; /* buffer for storing file info */ + struct stat buffer; /* buffer for storing file info */ char sum[65]; /* buffer for checksum */ char *file; if (hexchat_get_prefs (ph, "dcc_completed_dir", &file, NULL) == 1 && file[0] != 0) @@ -184,7 +180,7 @@ dccrecv_cb (char *word[], void *userdata) file = g_strdup(word[2]); } - result = stat64 (file, &buffer); + result = stat (file, &buffer); if (result == 0) /* stat returns 0 on success */ { if (buffer.st_size <= (unsigned long long) get_limit () * 1048576) @@ -213,10 +209,10 @@ static int dccoffer_cb (char *word[], void *userdata) { int result; - struct stat64 buffer; /* buffer for storing file info */ + struct stat buffer; /* buffer for storing file info */ char sum[65]; /* buffer for checksum */ - result = stat64 (word[3], &buffer); + result = stat (word[3], &buffer); if (result == 0) /* stat returns 0 on success */ { if (buffer.st_size <= (unsigned long long) get_limit () * 1048576) |