arg.h   arg.h 
skipping to change at line 29 skipping to change at line 29
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEAL INGS * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEAL INGS
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
#ifndef __GJS_ARG_H__ #ifndef __GJS_ARG_H__
#define __GJS_ARG_H__ #define __GJS_ARG_H__
#include <glib.h> #include <glib.h>
#include <jsapi.h> #include "gjs/jsapi-util.h"
#include <girepository.h> #include <girepository.h>
G_BEGIN_DECLS G_BEGIN_DECLS
/* Different roles for a GArgument */ /* Different roles for a GArgument */
typedef enum { typedef enum {
GJS_ARGUMENT_ARGUMENT, GJS_ARGUMENT_ARGUMENT,
GJS_ARGUMENT_RETURN_VALUE, GJS_ARGUMENT_RETURN_VALUE,
GJS_ARGUMENT_FIELD, GJS_ARGUMENT_FIELD,
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 boxed.h   boxed.h 
skipping to change at line 29 skipping to change at line 29
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEAL INGS * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEAL INGS
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
#ifndef __GJS_BOXED_H__ #ifndef __GJS_BOXED_H__
#define __GJS_BOXED_H__ #define __GJS_BOXED_H__
#include <glib.h> #include <glib.h>
#include <jsapi.h> #include "gjs/jsapi-util.h"
#include <girepository.h> #include <girepository.h>
G_BEGIN_DECLS G_BEGIN_DECLS
typedef enum { typedef enum {
GJS_BOXED_CREATION_NONE = 0, GJS_BOXED_CREATION_NONE = 0,
GJS_BOXED_CREATION_NO_COPY = (1 << 0) GJS_BOXED_CREATION_NO_COPY = (1 << 0)
} GjsBoxedCreationFlags; } GjsBoxedCreationFlags;
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 byteArray.h   byteArray.h 
skipping to change at line 32 skipping to change at line 32
*/ */
#ifndef __GJS_BYTE_ARRAY_H__ #ifndef __GJS_BYTE_ARRAY_H__
#define __GJS_BYTE_ARRAY_H__ #define __GJS_BYTE_ARRAY_H__
#if !defined (__GJS_GJS_H__) && !defined (GJS_COMPILATION) #if !defined (__GJS_GJS_H__) && !defined (GJS_COMPILATION)
#error "Only <gjs/gjs.h> can be included directly." #error "Only <gjs/gjs.h> can be included directly."
#endif #endif
#include <glib.h> #include <glib.h>
#include "gjs/jsapi-util.h"
#include <jsapi.h>
G_BEGIN_DECLS G_BEGIN_DECLS
JSBool gjs_define_byte_array_stuff (JSContext *context, JSBool gjs_define_byte_array_stuff (JSContext *context,
JSObject *in_object); JSObject *in_object);
JSObject * gjs_byte_array_from_byte_array (JSContext *context, JSObject * gjs_byte_array_from_byte_array (JSContext *context,
GByteArray *array); GByteArray *array);
GByteArray * gjs_byte_array_get_byte_array (JSContext *context, GByteArray * gjs_byte_array_get_byte_array (JSContext *context,
JSObject *object); JSObject *object);
 End of changes. 1 change blocks. 
2 lines changed or deleted 1 lines changed or added


 closure.h   closure.h 
skipping to change at line 29 skipping to change at line 29
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEAL INGS * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEAL INGS
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
#ifndef __GJS_CLOSURE_H__ #ifndef __GJS_CLOSURE_H__
#define __GJS_CLOSURE_H__ #define __GJS_CLOSURE_H__
#include <glib-object.h> #include <glib-object.h>
#include <jsapi.h> #include "gjs/jsapi-util.h"
G_BEGIN_DECLS G_BEGIN_DECLS
GClosure* gjs_closure_new (JSContext *context, GClosure* gjs_closure_new (JSContext *context,
JSObject *callable, JSObject *callable,
const char *description, const char *description,
gboolean root_function); gboolean root_function);
void gjs_closure_invoke (GClosure *closure, void gjs_closure_invoke (GClosure *closure,
int argc, int argc,
jsval *argv, jsval *argv,
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 compat.h   compat.h 
skipping to change at line 32 skipping to change at line 32
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
#if !defined (__GJS_GJS_MODULE_H__) && !defined (GJS_COMPILATION) #if !defined (__GJS_GJS_MODULE_H__) && !defined (GJS_COMPILATION)
#error "Only <gjs/gjs-module.h> can be included directly." #error "Only <gjs/gjs-module.h> can be included directly."
#endif #endif
#ifndef __GJS_COMPAT_H__ #ifndef __GJS_COMPAT_H__
#define __GJS_COMPAT_H__ #define __GJS_COMPAT_H__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wstrict-prototypes"
#pragma GCC diagnostic ignored "-Winvalid-offsetof"
#include <jsapi.h> #include <jsapi.h>
#include <jsdbgapi.h> // Needed by some bits
#pragma GCC diagnostic pop
#include <glib.h> #include <glib.h>
G_BEGIN_DECLS G_BEGIN_DECLS
/* This file inspects jsapi.h and attempts to provide a compatibility shim. /* This file inspects jsapi.h and attempts to provide a compatibility shim.
* See https://bugzilla.gnome.org/show_bug.cgi?id=622896 for some initial d iscussion. * See https://bugzilla.gnome.org/show_bug.cgi?id=622896 for some initial d iscussion.
*/ */
/** /**
* GJS_NATIVE_CONSTRUCTOR_DECLARE: * GJS_NATIVE_CONSTRUCTOR_DECLARE:
 End of changes. 2 change blocks. 
0 lines changed or deleted 5 lines changed or added


 enumeration.h   enumeration.h 
skipping to change at line 29 skipping to change at line 29
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEAL INGS * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEAL INGS
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
#ifndef __GJS_ENUMERATION_H__ #ifndef __GJS_ENUMERATION_H__
#define __GJS_ENUMERATION_H__ #define __GJS_ENUMERATION_H__
#include <glib.h> #include <glib.h>
#include <jsapi.h> #include "gjs/jsapi-util.h"
#include <girepository.h> #include <girepository.h>
G_BEGIN_DECLS G_BEGIN_DECLS
JSBool gjs_define_enum_values (JSContext *context, JSBool gjs_define_enum_values (JSContext *context,
JSObject *in_object, JSObject *in_object,
GIEnumInfo *info); GIEnumInfo *info);
JSBool gjs_define_enumeration (JSContext *context, JSBool gjs_define_enumeration (JSContext *context,
JSObject *in_object, JSObject *in_object,
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 function.h   function.h 
skipping to change at line 29 skipping to change at line 29
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEAL INGS * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEAL INGS
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
#ifndef __GJS_FUNCTION_H__ #ifndef __GJS_FUNCTION_H__
#define __GJS_FUNCTION_H__ #define __GJS_FUNCTION_H__
#include <glib.h> #include <glib.h>
#include <jsapi.h> #include "gjs/jsapi-util.h"
#include <girepository.h> #include <girepository.h>
#include <girffi.h> #include <girffi.h>
G_BEGIN_DECLS G_BEGIN_DECLS
typedef enum { typedef enum {
PARAM_NORMAL, PARAM_NORMAL,
PARAM_SKIPPED, PARAM_SKIPPED,
PARAM_ARRAY, PARAM_ARRAY,
skipping to change at line 76 skipping to change at line 76
GType gtype, GType gtype,
GICallableInfo *info); GICallableInfo *info);
JSBool gjs_invoke_c_function_uncached (JSContext *context, JSBool gjs_invoke_c_function_uncached (JSContext *context,
GIFunctionInfo *info, GIFunctionInfo *info,
JSObject *obj, JSObject *obj,
uintN argc, uintN argc,
jsval *argv, jsval *argv,
jsval *rval); jsval *rval);
void gjs_init_cinvoke_profiling (); void gjs_init_cinvoke_profiling (void);
G_END_DECLS G_END_DECLS
#endif /* __GJS_FUNCTION_H__ */ #endif /* __GJS_FUNCTION_H__ */
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 gerror.h   gerror.h 
skipping to change at line 28 skipping to change at line 28
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEAL INGS * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEAL INGS
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
#ifndef __GJS_ERROR_H__ #ifndef __GJS_ERROR_H__
#define __GJS_ERROR_H__ #define __GJS_ERROR_H__
#include <glib.h> #include <glib.h>
#include <jsapi.h>
#include <girepository.h> #include <girepository.h>
#include "gjs/jsapi-util.h"
G_BEGIN_DECLS G_BEGIN_DECLS
JSBool gjs_define_error_class (JSContext *context, JSBool gjs_define_error_class (JSContext *context,
JSObject *in_object, JSObject *in_object,
GIEnumInfo *info, GIEnumInfo *info,
JSObject **constructor_ p, JSObject **constructor_ p,
JSObject **prototype_p) ; JSObject **prototype_p) ;
JSObject* gjs_lookup_error_constructor (JSContext *context, JSObject* gjs_lookup_error_constructor (JSContext *context,
GIEnumInfo *info); GIEnumInfo *info);
JSObject* gjs_lookup_error_prototype (JSContext *context, JSObject* gjs_lookup_error_prototype (JSContext *context,
 End of changes. 2 change blocks. 
3 lines changed or deleted 2 lines changed or added


 gtype.h   gtype.h 
skipping to change at line 29 skipping to change at line 29
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEAL INGS * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEAL INGS
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
#ifndef __GJS_GTYPE_H__ #ifndef __GJS_GTYPE_H__
#define __GJS_GTYPE_H__ #define __GJS_GTYPE_H__
#include <glib.h> #include <glib.h>
#include <jsapi.h>
#include <girepository.h> #include <girepository.h>
#include "gjs/jsapi-util.h"
G_BEGIN_DECLS G_BEGIN_DECLS
jsval gjs_gtype_create_proto (JSContext *context, jsval gjs_gtype_create_proto (JSContext *context,
JSObject *module, JSObject *module,
const char *proto_name, const char *proto_name,
JSObject *parent); JSObject *parent);
JSObject * gjs_gtype_create_gtype_wrapper (JSContext *context, JSObject * gjs_gtype_create_gtype_wrapper (JSContext *context,
GType gtype); GType gtype);
 End of changes. 2 change blocks. 
3 lines changed or deleted 1 lines changed or added


 importer.h   importer.h 
skipping to change at line 32 skipping to change at line 32
*/ */
#ifndef __GJS_IMPORTER_H__ #ifndef __GJS_IMPORTER_H__
#define __GJS_IMPORTER_H__ #define __GJS_IMPORTER_H__
#if !defined (__GJS_GJS_MODULE_H__) && !defined (GJS_COMPILATION) #if !defined (__GJS_GJS_MODULE_H__) && !defined (GJS_COMPILATION)
#error "Only <gjs/gjs-module.h> can be included directly." #error "Only <gjs/gjs-module.h> can be included directly."
#endif #endif
#include <glib.h> #include <glib.h>
#include "gjs/jsapi-util.h"
#include <jsapi.h>
G_BEGIN_DECLS G_BEGIN_DECLS
JSBool gjs_create_root_importer (JSContext *context, JSBool gjs_create_root_importer (JSContext *context,
const char **initial_search_path, const char **initial_search_path,
gboolean add_standard_search_path); gboolean add_standard_search_path);
JSBool gjs_define_root_importer (JSContext *context, JSBool gjs_define_root_importer (JSContext *context,
JSObject *in_object, JSObject *in_object,
const char *importer_name); const char *importer_name);
JSObject* gjs_define_importer (JSContext *context, JSObject* gjs_define_importer (JSContext *context,
 End of changes. 1 change blocks. 
2 lines changed or deleted 1 lines changed or added


 interface.h   interface.h 
skipping to change at line 29 skipping to change at line 29
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEAL INGS * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEAL INGS
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
#ifndef __GJS_INTERFACE_H__ #ifndef __GJS_INTERFACE_H__
#define __GJS_INTERFACE_H__ #define __GJS_INTERFACE_H__
#include <glib.h> #include <glib.h>
#include <jsapi.h>
#include <girepository.h> #include <girepository.h>
#include "gjs/jsapi-util.h"
G_BEGIN_DECLS G_BEGIN_DECLS
JSBool gjs_define_interface_class (JSContext *context, JSBool gjs_define_interface_class (JSContext *context,
JSObject *in_object, JSObject *in_object,
GIInterfaceInfo *info, GIInterfaceInfo *info,
JSObject **prototype_p); JSObject **prototype_p);
G_END_DECLS G_END_DECLS
 End of changes. 2 change blocks. 
3 lines changed or deleted 1 lines changed or added


 jsapi-util.h   jsapi-util.h 
skipping to change at line 31 skipping to change at line 31
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
#ifndef __GJS_JSAPI_UTIL_H__ #ifndef __GJS_JSAPI_UTIL_H__
#define __GJS_JSAPI_UTIL_H__ #define __GJS_JSAPI_UTIL_H__
#if !defined (__GJS_GJS_MODULE_H__) && !defined (GJS_COMPILATION) #if !defined (__GJS_GJS_MODULE_H__) && !defined (GJS_COMPILATION)
#error "Only <gjs/gjs-module.h> can be included directly." #error "Only <gjs/gjs-module.h> can be included directly."
#endif #endif
#include <jsapi.h>
#include <gjs/compat.h> #include <gjs/compat.h>
#include <glib-object.h> #include <glib-object.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GJS_UTIL_ERROR gjs_util_error_quark () #define GJS_UTIL_ERROR gjs_util_error_quark ()
GQuark gjs_util_error_quark (void); GQuark gjs_util_error_quark (void);
enum { enum {
GJS_UTIL_ERROR_NONE, GJS_UTIL_ERROR_NONE,
GJS_UTIL_ERROR_ARGUMENT_INVALID, GJS_UTIL_ERROR_ARGUMENT_INVALID,
 End of changes. 1 change blocks. 
1 lines changed or deleted 0 lines changed or added


 keep-alive.h   keep-alive.h 
skipping to change at line 28 skipping to change at line 28
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEAL INGS * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEAL INGS
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
#ifndef __GJS_KEEP_ALIVE_H__ #ifndef __GJS_KEEP_ALIVE_H__
#define __GJS_KEEP_ALIVE_H__ #define __GJS_KEEP_ALIVE_H__
#include <glib.h> #include <glib.h>
#include <jsapi.h> #include "gjs/jsapi-util.h"
G_BEGIN_DECLS G_BEGIN_DECLS
/* This is an alternative to JS_AddRoot(). /* This is an alternative to JS_AddRoot().
* *
* This "keep alive" object holds a collection of child objects and * This "keep alive" object holds a collection of child objects and
* traces them when GC occurs. If the keep alive object is collected, * traces them when GC occurs. If the keep alive object is collected,
* it calls a notification function on all the child objects. * it calls a notification function on all the child objects.
* *
* The "global keep alive" is stuck on the global object as a property, * The "global keep alive" is stuck on the global object as a property,
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 mem.h   mem.h 
skipping to change at line 32 skipping to change at line 32
*/ */
#ifndef __GJS_MEM_H__ #ifndef __GJS_MEM_H__
#define __GJS_MEM_H__ #define __GJS_MEM_H__
#if !defined (__GJS_GJS_MODULE_H__) && !defined (GJS_COMPILATION) #if !defined (__GJS_GJS_MODULE_H__) && !defined (GJS_COMPILATION)
#error "Only <gjs/gjs-module.h> can be included directly." #error "Only <gjs/gjs-module.h> can be included directly."
#endif #endif
#include <glib.h> #include <glib.h>
#include <jsapi.h> #include "gjs/jsapi-util.h"
G_BEGIN_DECLS G_BEGIN_DECLS
typedef struct { typedef struct {
unsigned int value; unsigned int value;
const char *name; const char *name;
} GjsMemCounter; } GjsMemCounter;
#define GJS_DECLARE_COUNTER(name) \ #define GJS_DECLARE_COUNTER(name) \
extern GjsMemCounter gjs_counter_ ## name ; extern GjsMemCounter gjs_counter_ ## name ;
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 native.h   native.h 
skipping to change at line 32 skipping to change at line 32
*/ */
#ifndef __GJS_NATIVE_H__ #ifndef __GJS_NATIVE_H__
#define __GJS_NATIVE_H__ #define __GJS_NATIVE_H__
#if !defined (__GJS_GJS_MODULE_H__) && !defined (GJS_COMPILATION) #if !defined (__GJS_GJS_MODULE_H__) && !defined (GJS_COMPILATION)
#error "Only <gjs/gjs-module.h> can be included directly." #error "Only <gjs/gjs-module.h> can be included directly."
#endif #endif
#include <glib.h> #include <glib.h>
#include "gjs/jsapi-util.h"
#include <jsapi.h>
G_BEGIN_DECLS G_BEGIN_DECLS
typedef enum { typedef enum {
/* This means that the GjsDefineModuleFunc defines the module /* This means that the GjsDefineModuleFunc defines the module
* name in the parent module, as opposed to the normal process * name in the parent module, as opposed to the normal process
* where the GjsDefineModuleFunc defines module contents. When * where the GjsDefineModuleFunc defines module contents. When
* importing imports.foo.bar, this flag means the native module is * importing imports.foo.bar, this flag means the native module is
* given foo and defines bar in it, while normally the native * given foo and defines bar in it, while normally the native
* module is given bar and defines stuff in that. * module is given bar and defines stuff in that.
skipping to change at line 68 skipping to change at line 67
* *
* This declaration will call gjs_register_native_module() when your * This declaration will call gjs_register_native_module() when your
* module is dlopen'd. We can't just use a well-known symbol name * module is dlopen'd. We can't just use a well-known symbol name
* in your module, because we need to dlopen modules with * in your module, because we need to dlopen modules with
* global symbols. * global symbols.
*/ */
typedef JSBool (* GjsDefineModuleFunc) (JSContext *context, typedef JSBool (* GjsDefineModuleFunc) (JSContext *context,
JSObject *module_obj); JSObject *module_obj);
/* FIXME - Reuse glib/glib/gconstructor.h */
#ifdef __GNUC__
#define _GJS_CONSTRUCTOR __attribute__((constructor))
#elif __SUNPRO_C
#define Pragma(x) _Pragma(#x)
#define _GJS_CONSTRUCTOR Pragma(init(register_native_module))
#else
Initialization routine in a dynamic object not defined for current compiler
#endif
#define GJS_REGISTER_NATIVE_MODULE_WITH_FLAGS(module_id_string, module_func , flags) \ #define GJS_REGISTER_NATIVE_MODULE_WITH_FLAGS(module_id_string, module_func , flags) \
__attribute__((constructor)) static void \ _GJS_CONSTRUCTOR static void \
register_native_module (void) \ register_native_module (void) \
{ \ { \
gjs_register_native_module(module_id_string, module_func, flags); \ gjs_register_native_module(module_id_string, module_func, flags); \
} }
#define GJS_REGISTER_NATIVE_MODULE(module_id_string, module_func) \ #define GJS_REGISTER_NATIVE_MODULE(module_id_string, module_func) \
GJS_REGISTER_NATIVE_MODULE_WITH_FLAGS(module_id_string, module_func, 0) GJS_REGISTER_NATIVE_MODULE_WITH_FLAGS(module_id_string, module_func, 0)
/* called in constructor function on dlopen() load */ /* called in constructor function on dlopen() load */
void gjs_register_native_module (const char *module_id, void gjs_register_native_module (const char *module_id,
 End of changes. 3 change blocks. 
3 lines changed or deleted 12 lines changed or added


 ns.h   ns.h 
skipping to change at line 28 skipping to change at line 28
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEAL INGS * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEAL INGS
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
#ifndef __GJS_NS_H__ #ifndef __GJS_NS_H__
#define __GJS_NS_H__ #define __GJS_NS_H__
#include <glib.h> #include <glib.h>
#include <jsapi.h>
#include <girepository.h> #include <girepository.h>
#include "gjs/jsapi-util.h"
G_BEGIN_DECLS G_BEGIN_DECLS
JSObject* gjs_create_ns(JSContext *context, JSObject* gjs_create_ns(JSContext *context,
const char *ns_name, const char *ns_name,
GIRepository *repo); GIRepository *repo);
G_END_DECLS G_END_DECLS
#endif /* __GJS_NS_H__ */ #endif /* __GJS_NS_H__ */
 End of changes. 2 change blocks. 
3 lines changed or deleted 1 lines changed or added


 object.h   object.h 
skipping to change at line 28 skipping to change at line 28
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEAL INGS * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEAL INGS
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
#ifndef __GJS_OBJECT_H__ #ifndef __GJS_OBJECT_H__
#define __GJS_OBJECT_H__ #define __GJS_OBJECT_H__
#include <glib.h> #include <glib.h>
#include <jsapi.h>
#include <girepository.h> #include <girepository.h>
#include "gjs/jsapi-util.h"
G_BEGIN_DECLS G_BEGIN_DECLS
JSBool gjs_define_object_class (JSContext *context, JSBool gjs_define_object_class (JSContext *context,
JSObject *in_object, JSObject *in_object,
GType gtype, GType gtype,
JSObject **constructor_p, JSObject **constructor_p,
JSObject **prototype_p); JSObject **prototype_p);
JSObject* gjs_lookup_object_prototype (JSContext *context, JSObject* gjs_lookup_object_prototype (JSContext *context,
GType gtype); GType gtype);
 End of changes. 2 change blocks. 
3 lines changed or deleted 1 lines changed or added


 param.h   param.h 
skipping to change at line 28 skipping to change at line 28
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEAL INGS * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEAL INGS
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
#ifndef __GJS_PARAM_H__ #ifndef __GJS_PARAM_H__
#define __GJS_PARAM_H__ #define __GJS_PARAM_H__
#include <glib.h> #include <glib.h>
#include <jsapi.h>
#include <girepository.h> #include <girepository.h>
#include "gjs/jsapi-util.h"
G_BEGIN_DECLS G_BEGIN_DECLS
JSBool gjs_define_param_class (JSContext *context, JSBool gjs_define_param_class (JSContext *context,
JSObject *in_object, JSObject *in_object,
JSObject **prototype_p); JSObject **prototype_p);
GParamSpec* gjs_g_param_from_param (JSContext *context, GParamSpec* gjs_g_param_from_param (JSContext *context,
JSObject *obj); JSObject *obj);
JSObject* gjs_param_from_g_param (JSContext *context, JSObject* gjs_param_from_g_param (JSContext *context,
GParamSpec *param); GParamSpec *param);
 End of changes. 2 change blocks. 
3 lines changed or deleted 1 lines changed or added


 union.h   union.h 
skipping to change at line 28 skipping to change at line 28
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEAL INGS * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEAL INGS
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
#ifndef __GJS_UNION_H__ #ifndef __GJS_UNION_H__
#define __GJS_UNION_H__ #define __GJS_UNION_H__
#include <glib.h> #include <glib.h>
#include <jsapi.h>
#include <girepository.h> #include <girepository.h>
#include "gjs/jsapi-util.h"
G_BEGIN_DECLS G_BEGIN_DECLS
JSBool gjs_define_union_class (JSContext *context, JSBool gjs_define_union_class (JSContext *context,
JSObject *in_object, JSObject *in_object,
GIUnionInfo *info, GIUnionInfo *info,
JSObject **constructor_p, JSObject **constructor_p,
JSObject **prototype_p); JSObject **prototype_p);
JSObject* gjs_lookup_union_constructor (JSContext *context, JSObject* gjs_lookup_union_constructor (JSContext *context,
GIUnionInfo *info); GIUnionInfo *info);
 End of changes. 2 change blocks. 
3 lines changed or deleted 1 lines changed or added


 value.h   value.h 
skipping to change at line 28 skipping to change at line 28
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEAL INGS * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEAL INGS
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
#ifndef __GJS_VALUE_H__ #ifndef __GJS_VALUE_H__
#define __GJS_VALUE_H__ #define __GJS_VALUE_H__
#include <glib-object.h> #include <glib-object.h>
#include "gjs/jsapi-util.h"
#include <jsapi.h>
G_BEGIN_DECLS G_BEGIN_DECLS
JSBool gjs_value_to_g_value (JSContext *context, JSBool gjs_value_to_g_value (JSContext *context,
jsval value, jsval value,
GValue *gvalue); GValue *gvalue);
JSBool gjs_value_to_g_value_no_copy (JSContext *context, JSBool gjs_value_to_g_value_no_copy (JSContext *context,
jsval value, jsval value,
GValue *gvalue); GValue *gvalue);
JSBool gjs_value_from_g_value (JSContext *context, JSBool gjs_value_from_g_value (JSContext *context,
 End of changes. 1 change blocks. 
2 lines changed or deleted 1 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/