Change ObjectiveC/Output.mm to straight-up C++.

[cycript.git] / Baton.hpp

diff --git a/Baton.hpp b/Baton.hpp
index 3ce4e621b1c6815a6787b7949d3069f97f3c97e7..48d103d6afa54d0d5bf34215cce695eff3aa48c0 100644 (file)
--- a/Baton.hpp
+++ b/Baton.hpp
@@ -1,41 +1,32 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2010  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/>.
 **/
 /* }}} */
 
+#include "Standard.hpp"
+
 #include <dlfcn.h>
 #include <mach/mach.h>
 #include <sys/types.h>
 
 struct Baton {
-    void (*__pthread_set_self)(pthread_t);
-
-    int (*pthread_create)(pthread_t *, const pthread_attr_t *, void *(*)(void *), void *);
-    int (*pthread_join)(pthread_t, void **);
-
-    void *(*dlopen)(const char *, int);
-    char *(*dlerror)();
-    void *(*dlsym)(void *, const char *);
-
-    mach_port_t (*mach_thread_self)();
-    kern_return_t (*thread_terminate)(thread_act_t);
-
+    mach_vm_address_t dyld;
     pid_t pid;
     char library[];
-};
+} _packed;