diff -ur idasdk-versions/4.9/include/loader.hpp swigsdk-versions/4.9/include/loader.hpp ---- idasdk-versions/4.9/include/loader.hpp 2005-12-16 16:58:16.000000000 +0200 -+++ swigsdk-versions/4.9/include/loader.hpp 2005-12-16 17:10:57.000000000 +0200 +--- idasdk-versions/4.9/include/loader.hpp 2006-08-19 11:12:37.515625000 -0700 ++++ swigsdk-versions/4.9/include/loader.hpp 2006-08-25 15:12:01.718750000 -0700 @@ -32,6 +32,7 @@ // the appropriate structure. (loader_t for LDR module, for example) // @@ -1382,7 +1371,27 @@ //---------------------------------------------------------------------- // Helper functions for the loaders & ui //---------------------------------------------------------------------- -@@ -472,6 +477,7 @@ +@@ -353,6 +358,7 @@ + // no iterated data, etc) + #define FILEREG_NOTPATCHABLE 0 // the data is kept in some encoded + // form in the file. ++#endif // SWIG + + + // Load database from the memory. +@@ -363,9 +369,10 @@ + // This function works for wide byte processors too. + // returns: always 1 + +-idaman int ida_export mem2base(const void *memptr,ea_t ea1,ea_t ea2,long fpos); ++idaman int ida_export mem2base(const char *memptr,ea_t ea1,ea_t ea2,long fpos); + + ++#ifndef SWIG + // Unload database to a binary file. + // fp - pointer to file + // pos - position in the file +@@ -472,6 +479,7 @@ // if the ids file does not exist, no message is displayed idaman int ida_export load_ids_module(char *fname); @@ -1390,7 +1399,7 @@ //---------------------------------------------------------------------- -@@ -508,6 +514,7 @@ +@@ -508,6 +516,7 @@ // until the processor module is unloaded #define PLUGIN_FIX 0x0080 // Load plugin when IDA starts and keep it in the // memory until IDA stops @@ -1398,7 +1407,7 @@ int (idaapi* init)(void); // Initialize plugin #define PLUGIN_SKIP 0 // Plugin doesn't want to be loaded #define PLUGIN_OK 1 // Plugin agrees to work with the current database -@@ -523,8 +530,10 @@ +@@ -523,8 +532,10 @@ char *help; // Multiline help about the plugin char *wanted_name; // The preferred short name of the plugin char *wanted_hotkey; // The preferred hotkey to run the plugin @@ -1409,7 +1418,7 @@ extern "C" plugin_t PLUGIN; // (declaration for plugins) //-------------------------------------------------------------------------- -@@ -585,6 +594,7 @@ +@@ -585,6 +596,7 @@ // idaman int ida_export invoke_callbacks(hook_type_t hook_type, int notification_code, va_list va); @@ -1417,7 +1426,7 @@ // Get plugin options from the command line -@@ -596,6 +606,7 @@ +@@ -596,6 +608,7 @@ idaman const char *ida_export get_plugin_options(const char *plugin); @@ -1425,7 +1434,7 @@ //-------------------------------------------------------------------------- // PLUGIN module file name extensions: -@@ -778,6 +789,7 @@ +@@ -778,6 +791,7 @@ inline void save_fileregions(void) {} // called by the kernel void add_fileregion(ea_t ea1,ea_t ea2,long fpos); // called by the kernel void move_fileregions(ea_t from, ea_t to, asize_t size);// called by the kernel @@ -1433,7 +1442,7 @@ // Get offset in the input file which corresponds to the given ea // If the specified ea can't be mapped into the input file offset, -@@ -792,6 +804,7 @@ +@@ -792,6 +806,7 @@ idaman ea_t ida_export get_fileregion_ea(long offset); @@ -1441,16 +1450,17 @@ //------------------------------------------------------------------------ // Generate an exe file (unload the database in binary form) // fp - the output file handle -@@ -894,5 +907,6 @@ +@@ -894,5 +909,6 @@ char **autotils, int maxtils); +#endif // SWIG #pragma pack(pop) #endif