summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoramber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-11-27 19:03:43 +0000
committeramber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-11-27 19:03:43 +0000
commitf0da8da932031212f34aa97eff882f72cb69cc2a (patch)
tree8196d22d0fce973ac6e53b24735776ba9dcaf77f
parent5c7ba1b7219cfd93bb353015ae293514a440169f (diff)
downloadhercules-f0da8da932031212f34aa97eff882f72cb69cc2a.tar.gz
hercules-f0da8da932031212f34aa97eff882f72cb69cc2a.tar.bz2
hercules-f0da8da932031212f34aa97eff882f72cb69cc2a.tar.xz
hercules-f0da8da932031212f34aa97eff882f72cb69cc2a.zip
Fix some compile time errors
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/athena@383 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog.txt1
-rw-r--r--src/common/showmsg.c2
-rw-r--r--src/txt-converter/char/GNUmakefile2
-rw-r--r--src/txt-converter/login/GNUmakefile2
4 files changed, 4 insertions, 3 deletions
diff --git a/Changelog.txt b/Changelog.txt
index 59d433abc..545234850 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,5 +1,6 @@
Date Added
11/27
+ * Fixed some compile time errors associated with showmsg [MouseJstr]
* Added get_svn_revision() in core.c [MC Cameri]
-Only if you have the file .svn\entries, it will show the revision # at runtime.
diff --git a/src/common/showmsg.c b/src/common/showmsg.c
index 56c41b89d..b65181f3a 100644
--- a/src/common/showmsg.c
+++ b/src/common/showmsg.c
@@ -3,7 +3,7 @@
#include <string.h>
#include "showmsg.h"
-char tmp_output[1024] = "\0";
+char tmp_output[1024] = {"\0"};
int _ShowMessage(const char *string, enum msg_type flag){ // by MC Cameri
/*
diff --git a/src/txt-converter/char/GNUmakefile b/src/txt-converter/char/GNUmakefile
index 56723ca5a..5d4c61535 100644
--- a/src/txt-converter/char/GNUmakefile
+++ b/src/txt-converter/char/GNUmakefile
@@ -1,7 +1,7 @@
all: char-converter
sql: char-converter
-COMMON_OBJ = ../../common/core.o ../../common/socket.o ../../common/timer.o ../../common/db.o ../../common/malloc.o
+COMMON_OBJ = ../../common/core.o ../../common/socket.o ../../common/timer.o ../../common/db.o ../../common/malloc.o ../../common/showmsg.o
char-converter: char-converter.o strlib.o $(COMMON_OBJ)
$(CC) -o ../../../$@ $^ $(LIB_S)
diff --git a/src/txt-converter/login/GNUmakefile b/src/txt-converter/login/GNUmakefile
index 9f34e143a..2d36f709f 100644
--- a/src/txt-converter/login/GNUmakefile
+++ b/src/txt-converter/login/GNUmakefile
@@ -1,7 +1,7 @@
all: login-converter
sql: login-converter
-COMMON_OBJ = ../../common/core.o ../../common/socket.o ../../common/timer.o ../../common/db.o ../../common/malloc.o
+COMMON_OBJ = ../../common/core.o ../../common/socket.o ../../common/timer.o ../../common/db.o ../../common/malloc.o ../../common/showmsg.o
COMMON_H = ../../common/core.h ../../common/socket.h ../../common/timer.h ../../common/mmo.h ../../common/version.h ../../common/db.h ../../common/malloc.h
login-converter: login-converter.o ../../login_sql/md5calc.o ../../login_sql/strlib.o $(COMMON_OBJ)