* Removed 'strsignal' forward-declaration from 'sig' plugin to prevent random gcc distributions from failing to compile due to mismatched declaration already present in <string.h> (bugreport:4644, topic:262284, follow up to r14591).
- Removed WIN32 conditions in non-WIN32 code in 'sig' plugin (follow up to r4380). git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14610 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
parent
8643992d0b
commit
2a043e4999
@ -1,5 +1,8 @@
|
||||
Date Added
|
||||
|
||||
2010/12/21
|
||||
* Removed 'strsignal' forward-declaration from 'sig' plugin to prevent random gcc distributions from failing to compile due to mismatched declaration already present in <string.h> (bugreport:4644, topic:262284, follow up to r14591). [Ai4rei]
|
||||
- Removed WIN32 conditions in non-WIN32 code in 'sig' plugin (follow up to r4380).
|
||||
2010/12/19
|
||||
* Fixes to the dynamic shop sample script. [Ai4rei]
|
||||
- Fixed wrong check in ::OnSellItem, causing not-enough-items condition not getting detected (since r11829).
|
||||
|
@ -3,6 +3,7 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <signal.h>
|
||||
#define __USE_GNU // required to enable strsignal on some platforms
|
||||
#include <string.h>
|
||||
#include <time.h>
|
||||
#include "../common/plugin.h"
|
||||
@ -52,11 +53,6 @@ unsigned long (*getuptime)();
|
||||
char *server_name;
|
||||
int crash_flag = 0;
|
||||
|
||||
#ifndef __APPLE__
|
||||
extern const char *strsignal(int);
|
||||
#else
|
||||
extern char *strsignal(int);
|
||||
#endif
|
||||
int sig_final ();
|
||||
|
||||
// by Gabuzomeu
|
||||
@ -64,9 +60,6 @@ int sig_final ();
|
||||
// (sigaction() is POSIX; signal() is not.) Taken from Stevens' _Advanced
|
||||
// Programming in the UNIX Environment_.
|
||||
//
|
||||
#ifdef WIN32 // windows don't have SIGPIPE
|
||||
#define SIGPIPE SIGINT
|
||||
#endif
|
||||
|
||||
#ifndef POSIX
|
||||
#define compat_signal(signo, func) signal(signo, func)
|
||||
@ -207,9 +200,7 @@ int sig_init ()
|
||||
compat_signal(SIGSEGV, func);
|
||||
compat_signal(SIGFPE, func);
|
||||
compat_signal(SIGILL, func);
|
||||
#ifndef __WIN32
|
||||
compat_signal(SIGBUS, func);
|
||||
#endif
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user