debug系関数の引数の一部マクロ化。

[chnosproject/CHNOSProject.git] / CHNOSProject / chn / chnlib.h

diff --git a/CHNOSProject/chn/chnlib.h b/CHNOSProject/chn/chnlib.h
index 6d9c68d..ec5a027 100755 (executable)
--- a/CHNOSProject/chn/chnlib.h
+++ b/CHNOSProject/chn/chnlib.h
@@ -23,6 +23,8 @@
 #endif\r
 #endif\r
 \r
+#define CHNLIB_DEBUG_ARGUMENTS  __FILE__, __LINE__, __FUNCTION__\r
+\r
 #ifdef DEBUG\r
 //#define DEBUG_MEMORY_ALLOCATION\r
 #endif\r
@@ -37,6 +39,7 @@ typedef unsigned int uint;
 \r
 typedef struct CHNLIB_STRUCTURE_HEADER CHNLIB_StructureHeader;\r
 struct CHNLIB_STRUCTURE_HEADER {\r
+    //ライブラリ共通構造体ヘッダ\r
     uint signature;\r
     uint typeid;\r
 };\r
@@ -64,7 +67,7 @@ struct CHNLIB_STRUCTURE_HEADER {
 //@chnlib.c\r
 void CHNLIB_Debug(const char format[], const char filename[], int line, const char funcname[], ...);\r
 void CHNLIB_Debug_PrintStructureData(void *structure, uint level);\r
-void CHNLIB_ReportError(const char format[], const char filename[], int line, const char funcname[], ...);  //("", __FILE__, __LINE__, __FUNCTION__);\r
+void CHNLIB_ReportError(const char format[], const char filename[], int line, const char funcname[], ...);  //("", CHNLIB_DEBUG_ARGUMENTS);\r
 void CHNLIB_StructureHeader_Initialize(CHNLIB_StructureHeader *header, uint typeid);\r
 uint CHNLIB_StructureHeader_GetTypeID(const void *structure);\r
 void *CHNLIB_System_AllocateMemory_Strict(int size, const char filename[], int line, const char funcname[]);\r