Only link libcycript against libffi (not cycript).

[cycript.git] / Exception.hpp

diff --git a/Exception.hpp b/Exception.hpp
index 956007115e7ed55e8dbe560587046daae255e3e2..97c629cbd6e95496bbc0f3ced5f633e4e6895720 100644 (file)
--- a/Exception.hpp
+++ b/Exception.hpp
@@ -1,20 +1,20 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
 /* Cycript - Optimizing JavaScript Compiler/Runtime

- * Copyright (C) 2009-2012  Jay Freeman (saurik)
+ * Copyright (C) 2009-2013  Jay Freeman (saurik)

 */
 
 */
 

-/* GNU Lesser General Public License, Version 3 {{{ */
+/* GNU General Public License, Version 3 {{{ */

 /*
 /*

- * Cycript is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
+ * Cycript is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.

  *
  *

- * Cycript is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
- * License for more details.
+ * Cycript is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.

  *
  *

- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License

  * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
 **/
 /* }}} */
  * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
 **/
 /* }}} */


@@ -47,13 +47,13 @@ void CYThrow(JSContextRef context, JSValueRef value);
 
 #define CYTry \
     try
 
 #define CYTry \
     try

-#define CYCatch \
+#define CYCatch(value) \

     catch (const CYException &error) { \
         *exception = error.CastJSValue(context); \
     catch (const CYException &error) { \
         *exception = error.CastJSValue(context); \

-        return NULL; \
+        return value; \

     } catch (...) { \
         *exception = CYCastJSValue(context, "catch(...)"); \
     } catch (...) { \
         *exception = CYCastJSValue(context, "catch(...)"); \

-        return NULL; \
+        return value; \

     }
 
 // XXX: fix this: _ is not safe; this is /not/ Menes ;P
     }
 
 // XXX: fix this: _ is not safe; this is /not/ Menes ;P