OSX: Multiple libedit/readline fixes (#585)

[proxmark3-svn] / client / proxmark3.c

diff --git a/client/proxmark3.c b/client/proxmark3.c
index 99ba9fbad77ec9dbcea40bc0b36074ea7914b0e5..1b64f68b2e7f12624dee586eb4246f3e1bd723d2 100644 (file)
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -67,7 +67,14 @@ struct receiver_arg {
 byte_t rx[sizeof(UsbCommand)];
 byte_t* prx = rx;
 
-static void *uart_receiver(void *targ) {
+
+static void
+#ifdef __has_attribute
+#if __has_attribute(force_align_arg_pointer)
+__attribute__((force_align_arg_pointer)) 
+#endif
+#endif
+*uart_receiver(void *targ) {
        struct receiver_arg *arg = (struct receiver_arg*)targ;
        size_t rxlen;
 
@@ -95,7 +102,13 @@ static void *uart_receiver(void *targ) {
 }
 
 
-void main_loop(char *script_cmds_file, char *script_cmd, bool usb_present) {
+void
+#ifdef __has_attribute
+#if __has_attribute(force_align_arg_pointer)
+__attribute__((force_align_arg_pointer)) 
+#endif
+#endif
+main_loop(char *script_cmds_file, char *script_cmd, bool usb_present) {
        struct receiver_arg rarg;
        char *cmd = NULL;
        pthread_t reader_thread;
@@ -119,7 +132,7 @@ void main_loop(char *script_cmds_file, char *script_cmd, bool usb_present) {
                        printf("executing commands from file: %s\n", script_cmds_file);
                }
        }
-       
+
        read_history(".history");
 
        while(1)  {