diff options
| author | toms <toms@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-09-19 13:25:39 +0000 |
|---|---|---|
| committer | toms <toms@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-09-19 13:25:39 +0000 |
| commit | 1588eefb6be4303a88804a8079c47c29239bc01e (patch) | |
| tree | f18de1e67b0af9fa35522bca7b62b804be7b0ea5 /src/common | |
| parent | 5208a0be9d90add076d1d7646e074085ccce4b77 (diff) | |
| download | hercules-1588eefb6be4303a88804a8079c47c29239bc01e.tar.gz hercules-1588eefb6be4303a88804a8079c47c29239bc01e.tar.bz2 hercules-1588eefb6be4303a88804a8079c47c29239bc01e.tar.xz hercules-1588eefb6be4303a88804a8079c47c29239bc01e.zip | |
Fixed some gcc4 warnings
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8807 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/core.c | 5 | ||||
| -rw-r--r-- | src/common/graph.c | 2 | ||||
| -rw-r--r-- | src/common/grfio.c | 2 | ||||
| -rw-r--r-- | src/common/grfio.h | 2 | ||||
| -rw-r--r-- | src/common/socket.c | 2 |
5 files changed, 7 insertions, 6 deletions
diff --git a/src/common/core.c b/src/common/core.c index 75335b597..b35551d39 100644 --- a/src/common/core.c +++ b/src/common/core.c @@ -33,8 +33,9 @@ char **arg_v = NULL; char *SERVER_NAME = NULL;
char SERVER_TYPE = ATHENA_SERVER_NONE;
static void (*term_func)(void) = NULL;
-static char eA_svn_version[10];
-
+#ifdef SVNVERSION
+ static char eA_svn_version[10];
+#endif
/*======================================
* CORE : Set function
*--------------------------------------
diff --git a/src/common/graph.c b/src/common/graph.c index 4caa830e6..3602f511f 100644 --- a/src/common/graph.c +++ b/src/common/graph.c @@ -267,7 +267,7 @@ static int graph_draw_timer(int tid,unsigned int tick,int id,int data) return 0;
}
-void graph_add_sensor(const char* string, int interval, unsigned int (*callback_func)(void))
+void graph_add_sensor(const unsigned char* string, int interval, unsigned int (*callback_func)(void))
{
int draw_interval = interval * 2;
struct graph *g = graph_create(GRP_WIDTH,GRP_HEIGHT);
diff --git a/src/common/grfio.c b/src/common/grfio.c index 6cfc7eeaa..5597177c5 100644 --- a/src/common/grfio.c +++ b/src/common/grfio.c @@ -403,7 +403,7 @@ int deflate_file (const char *source, const char *filename) return 0;
}
-unsigned long grfio_crc32 (const char *buf, unsigned int len)
+unsigned long grfio_crc32 (const unsigned char *buf, unsigned int len)
{
return crc32(crc32(0L, Z_NULL, 0), buf, len);
}
diff --git a/src/common/grfio.h b/src/common/grfio.h index e2a70ae75..4ccdd00c7 100644 --- a/src/common/grfio.h +++ b/src/common/grfio.h @@ -13,7 +13,7 @@ char *grfio_alloc_ptr(char *fname); #define grfio_read(fn) grfio_reads(fn, NULL)
int grfio_size(char*); // GRFIO data file size get
-unsigned long grfio_crc32(const char *buf, unsigned int len);
+unsigned long grfio_crc32(const unsigned char *buf, unsigned int len);
int decode_zip(unsigned char *dest, unsigned long* destLen, const unsigned char* source, unsigned long sourceLen);
int encode_zip(unsigned char *dest, unsigned long* destLen, const unsigned char* source, unsigned long sourceLen);
diff --git a/src/common/socket.c b/src/common/socket.c index 450f6d09b..b5eda7b27 100644 --- a/src/common/socket.c +++ b/src/common/socket.c @@ -1346,7 +1346,7 @@ bool session_isActive(int fd) in_addr_t resolve_hostbyname(char* hostname, unsigned char *ip, char *ip_str) {
struct hostent *h = gethostbyname(hostname);
- unsigned char ip_buf[16];
+ char ip_buf[16];
unsigned char ip2[4];
if (!h) return 0;
if (ip == NULL) ip = ip2;
|