diff options
| author | flaviojs <flaviojs@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-03-20 16:59:07 +0000 |
|---|---|---|
| committer | flaviojs <flaviojs@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-03-20 16:59:07 +0000 |
| commit | ee36fd725c890c5156f1d777368eeb84d5a3922e (patch) | |
| tree | bdbec3c90830fa82e78774f62032896de7a2ba1a /src/plugins | |
| parent | 78fe9886d39b11a38903ffc513a70fa2b00e43f3 (diff) | |
| download | hercules-ee36fd725c890c5156f1d777368eeb84d5a3922e.tar.gz hercules-ee36fd725c890c5156f1d777368eeb84d5a3922e.tar.bz2 hercules-ee36fd725c890c5156f1d777368eeb84d5a3922e.tar.xz hercules-ee36fd725c890c5156f1d777368eeb84d5a3922e.zip | |
- Fixed CMake compilation (libconfig integrated into common_base).
- Chanced libconfig.h include directives to double-quoted form (never use the system version of libconfig.h).
- Removed ShowError/ShowNotice from sig plugin (showmsg.c depends on core.c).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15737 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/plugins/sig.c | 9 |
2 files changed, 5 insertions, 12 deletions
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt index 903a1ec6e..21ffc3994 100644 --- a/src/plugins/CMakeLists.txt +++ b/src/plugins/CMakeLists.txt @@ -151,17 +151,11 @@ option( BUILD_PLUGIN_sig "build sig plugin" OFF ) if( BUILD_PLUGIN_sig ) message( STATUS "Creating target sig" ) set( SIG_SOURCES - "${COMMON_SOURCE_DIR}/malloc.c" - "${COMMON_SOURCE_DIR}/malloc.h" - "${COMMON_SOURCE_DIR}/showmsg.c" - "${COMMON_SOURCE_DIR}/showmsg.h" - "${COMMON_SOURCE_DIR}/strlib.c" - "${COMMON_SOURCE_DIR}/strlib.h" "${CMAKE_CURRENT_SOURCE_DIR}/sig.c" ) set( LIBRARIES ${GLOBAL_LIBRARIES} ) set( INCLUDE_DIRS ${GLOBAL_INCLUDE_DIRS} ) -set( DEFINITIONS "${GLOBAL_DEFINITIONS} ${COMMON_MINI_DEFINITIONS} -DNO_MEMMGR" ) +set( DEFINITIONS "${GLOBAL_DEFINITIONS} -DNO_MEMMGR" ) set( SOURCE_FILES ${SIG_SOURCES} ) source_group( sig FILES ${SIG_SOURCES} ) include_directories( ${INCLUDE_DIRS} ) diff --git a/src/plugins/sig.c b/src/plugins/sig.c index 8f7dead4b..04d07a496 100644 --- a/src/plugins/sig.c +++ b/src/plugins/sig.c @@ -7,7 +7,6 @@ #include <string.h> #include <time.h> #include "../common/plugin.h" -#include "../common/showmsg.h" PLUGIN_INFO = { "Signals", @@ -28,14 +27,14 @@ PLUGIN_EVENTS_TABLE = { #if defined(_WIN32) || defined(MINGW) int sig_init() { - ShowError("sig: This plugin is not supported - Enable 'exchndl' instead!\n"); + printf("sig: This plugin is not supported - Enable 'exchndl' instead!\n"); return 0; } int sig_final() { return 0; } #elif defined (__NETBSD__) || defined (__FREEBSD__) int sig_init() { - ShowError("sig: This plugin is not supported!\n"); + printf("sig: This plugin is not supported!\n"); return 0; } int sig_final() { return 0; } @@ -117,7 +116,7 @@ void sig_dump(int sn) size_t size; #endif - ShowNotice ("Dumping stack to '"CL_WHITE"%s"CL_RESET"'...\n", file); + printf ("sig: Dumping stack to '%s'...\n", file); if ((revision = getrevision()) != NULL) fprintf(fp, "Version: svn%s \n", revision); fprintf(fp, "Exception: %s \n", strsignal(sn)); @@ -136,7 +135,7 @@ void sig_dump(int sn) free(stack); #endif - ShowNotice("%s Saved.\n", file); + printf("sig: %s Saved.\n", file); fflush(stdout); fclose(fp); } |