Skip to content

Commit 005c598

Browse files
author
Nat!
committed
two less warnings ?
1 parent 8c959e9 commit 005c598

File tree

2 files changed

+7
-17
lines changed

2 files changed

+7
-17
lines changed

src/mulle-objc-class.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ void _mulle_objc_class_init( struct _mulle_objc_class *cls,
169169
// cls->nextclass = superclass;
170170
cls->classid = classid;
171171
cls->allocationsize = sizeof( struct _mulle_objc_objectheader) + instancesize + headerextrasize;
172-
cls->headerextrasize = headerextrasize;
172+
cls->headerextrasize = (uint16_t) headerextrasize;
173173
cls->universe = universe;
174174
cls->invalidate_caches = _mulle_objc_class_invalidate_caches_default;
175175

src/mulle-objc-universe-fail.c

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -209,24 +209,14 @@ static inline void *mulle_objc_create_debug_symbol( const char* symbol_name, v
209209

210210

211211
#if defined( _WIN32) && ! defined( __GNUC__)
212+
# define FUNCTION_POINTER_MULLE_C_NO_RETURN
213+
# else
214+
# define FUNCTION_POINTER_MULLE_C_NO_RETURN MULLE_C_NO_RETURN
215+
#endif
212216

213-
static void mulle_objc_call_debug_symbol( void (*f)( char *, va_list *),
214-
char * format, ...)
215-
{
216-
va_list args;
217-
218-
va_start( args, format);
219-
if( f)
220-
(*f)( format, &args);
221-
else
222-
_mulle_objc_vprintf_abort( format, args);
223-
va_end( args);
224-
}
225-
226-
#else
227217

228218
MULLE_C_NO_RETURN
229-
static void mulle_objc_call_debug_symbol( void (*f)( char *, va_list *) MULLE_C_NO_RETURN,
219+
static void mulle_objc_call_debug_symbol( void (*f)( char *, va_list *) FUNCTION_POINTER_MULLE_C_NO_RETURN,
230220
char * format, ...)
231221
{
232222
va_list args;
@@ -301,7 +291,7 @@ MULLE_C_NO_RETURN void
301291
struct _mulle_objc_descriptor *desc;
302292
char *methodname;
303293
char *name;
304-
void (*f)( char *, va_list *) MULLE_C_NO_RETURN;
294+
void (*f)( char *, va_list *) FUNCTION_POINTER_MULLE_C_NO_RETURN;
305295

306296
name = cls ? _mulle_objc_class_get_name( cls) : "???";
307297
methodname = NULL;

0 commit comments

Comments
 (0)