Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixe compile time problems with our mixed C++/C conformance

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/stable@1328 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
amber
2005-03-29 06:18:21 +00:00
parent 150683e2e6
commit dfd7258882
19 changed files with 108 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/socket.c
View File

@@ -678,7 +678,7 @@ static int connect_check_(unsigned int ip) {
hist = hist->next;
}
// IPリストに無いので新規作成
hist_new = aCalloc(1,sizeof(struct _connect_history));
hist_new = (struct _connect_history *) aCalloc(1,sizeof(struct _connect_history));
hist_new->ip = ip;
hist_new->tick = gettick();
if(connect_history[ip & 0xFFFF] != NULL) {
@@ -791,12 +791,12 @@ int socket_config_read(const char *cfgName) {
if(strcmpi(w2,"allow,deny")==0) access_order=ACO_ALLOW_DENY;
if(strcmpi(w2,"mutual-failure")==0) access_order=ACO_MUTUAL_FAILTURE;
} else if(strcmpi(w1,"allow")==0){
access_allow = aRealloc(access_allow,(access_allownum+1)*sizeof(struct _access_control));
access_allow = (struct _access_control *) aRealloc(access_allow,(access_allownum+1)*sizeof(struct _access_control));
if(access_ipmask(w2,&access_allow[access_allownum])) {
access_allownum++;
}
} else if(strcmpi(w1,"deny")==0){
access_deny = aRealloc(access_deny,(access_denynum+1)*sizeof(struct _access_control));
access_deny = (struct _access_control *) aRealloc(access_deny,(access_denynum+1)*sizeof(struct _access_control));
if(access_ipmask(w2,&access_deny[access_denynum])) {
access_denynum++;
}