Skip to content
Browse files

Updated xcode project.

  • Loading branch information...
1 parent 2e8161e commit 2244a534f0ed70504976bf2bdd46c5f536d3dd1d @mattbierner mattbierner committed Apr 29, 2012
Showing with 14 additions and 6 deletions.
  1. +6 −0 prosopon-core.xcodeproj/project.pbxproj
  2. +0 −2 src/pro_common.h
  3. +4 −2 src/pro_constructor.c
  4. +4 −1 src/pro_library.c
  5. +0 −1 src/pro_state.c
View
6 prosopon-core.xcodeproj/project.pbxproj
@@ -408,18 +408,21 @@
);
GCC_STRICT_ALIASING = YES;
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+ GCC_THREADSAFE_STATICS = NO;
GCC_VERSION = "";
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_CHECK_SWITCH_STATEMENTS = NO;
+ GCC_WARN_PEDANTIC = YES;
GCC_WARN_UNKNOWN_PRAGMAS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_LABEL = YES;
GCC_WARN_UNUSED_PARAMETER = NO;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = include;
+ LINK_WITH_STANDARD_LIBRARIES = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
ONLY_ACTIVE_ARCH = YES;
PROSOPON_ROOT_DIR = ..;
@@ -440,18 +443,21 @@
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_STRICT_ALIASING = YES;
+ GCC_THREADSAFE_STATICS = NO;
GCC_VERSION = "";
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_CHECK_SWITCH_STATEMENTS = NO;
+ GCC_WARN_PEDANTIC = YES;
GCC_WARN_UNKNOWN_PRAGMAS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_LABEL = YES;
GCC_WARN_UNUSED_PARAMETER = NO;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = include;
+ LINK_WITH_STANDARD_LIBRARIES = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
PROSOPON_ROOT_DIR = ..;
PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/prosopon;
View
2 src/pro_common.h
@@ -3,9 +3,7 @@
#include "prosopon/core.h"
-#ifdef DEBUG
#include <assert.h>
-#endif
/**
View
6 src/pro_constructor.c
@@ -1,6 +1,5 @@
#include "prosopon/core.h"
-#include "pro_env.h"
#include "pro_common.h"
#include "pro_object.h"
#include "pro_lookup.h"
@@ -19,7 +18,8 @@ pro_error pro_constructor_create(pro_state_ref s,
// Create a new object
pro_object* obj = pro_object_new(s, PRO_CONSTRUCTOR_TYPE, 1);
-
+ PRO_API_ASSERT(obj, PRO_OUT_OF_MEMORY);
+
// Set the implementation
obj->value.constructor.constructor = c;
@@ -32,6 +32,8 @@ pro_error pro_constructor_create(pro_state_ref s,
// Return the result
pro_ref lookup = pro_lookup_new(s, obj, 1);
+ PRO_API_ASSERT(lookup, PRO_OUT_OF_MEMORY);
+
*constructor = lookup;
return PRO_OK;
}
View
5 src/pro_library.c
@@ -23,7 +23,10 @@ struct pro_library_list
static void initialize_library(pro_state_ref s, void* lib_handle)
{
assert(lib_handle);
- pro_library_init* init = dlsym(lib_handle, "prosopon_library_initialization");
+
+ union { void* d; pro_library_init* f; } u;
+ u.d = dlsym(lib_handle, "prosopon_library_initialization");
+ pro_library_init* init = u.f;
if (!init)
{
fprintf(stderr, "%s\n", dlerror());
View
1 src/pro_state.c
@@ -1,6 +1,5 @@
#include "pro_state.h"
-#include "prosopon/core.h"
#include "pro_type.h"
#include "pro_common.h"
#include "pro_messaging.h"

0 comments on commit 2244a53

Please sign in to comment.
Something went wrong with that request. Please try again.