From 0b68aea31ef77fdaded96d7731ed86d3360a015e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADtor=20Santos=20Costa?= <vsc@dcc.fc.up.pt>
Date: Fri, 19 Jun 2015 00:53:09 +0100
Subject: [PATCH] all kinds of stuff

---
 H/Yap.h | 30 +++++++++++-------------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/H/Yap.h b/H/Yap.h
index d66f5b883..f954b9b24 100755
--- a/H/Yap.h
+++ b/H/Yap.h
@@ -1,4 +1,4 @@
-  /*************************************************************************
+/*************************************************************************
 *									 *
 *	 YAP Prolog 	%W% %G% 					 *
 *	Yap Prolog was developed at NCCUP - Universidade do Porto	 *
@@ -14,10 +14,11 @@
 *************************************************************************/
 
 #ifndef YAP_H
+
 #define YAP_H 1
 
 #if defined(YAPOR)
-#error Do not explicitly define YAPOR
+// #error Do not explicitly define YAPOR
 #endif /* YAPOR */
 
 #if (defined(YAPOR_COPY) && (defined(YAPOR_COW) || defined(YAPOR_SBA) || defined(YAPOR_THREADS))) || (defined(YAPOR_COW) && (defined(YAPOR_SBA) || defined(YAPOR_THREADS))) || (defined(YAPOR_SBA) && defined(YAPOR_THREADS))
@@ -305,16 +306,18 @@ typedef unsigned char *CODEADDR;
 
 #if !defined(YAPOR) && !defined(THREADS)
 #include <nolocks.h>
-#elif USE_PTHREAD_LOCKING || defined(__CYGWIN__)
+#else
 
 #ifndef _XOPEN_SOURCE
 #define _XOPEN_SOURCE 600
 #endif
 
+
 #include <locks_pthread.h>
 typedef pthread_mutex_t lockvar;
 typedef pthread_rwlock_t rwlock_t;
-
+#endif
+/*
 #elif defined(i386)|| defined(__x86_64__)
 typedef volatile int lockvar;
 #include <locks_x86.h>
@@ -332,11 +335,7 @@ typedef volatile int lockvar;
 #ifndef _XOPEN_SOURCE
 #define _XOPEN_SOURCE 600
 #endif
-
-typedef pthread_mutex_t lockvar;
-typedef pthread_rwlock_t rwlock_t;
-#include <locks_pthread.h>
-#endif
+ */
 
 #define FUNC_READ_LOCK(X) READ_LOCK((X)->FRWLock)
 #define FUNC_READ_UNLOCK(X) READ_UNLOCK((X)->FRWLock)
@@ -384,15 +383,6 @@ typedef pthread_rwlock_t rwlock_t;
 
 #include "Regs.h"
 
-#if defined(YAPOR) ||defined(THREADS)
-#ifdef mips
-#include <locks_mips_funcs.h>
-#endif
-#ifdef __alpha
-#include <locks_alpha_funcs.h>
-#endif
-#endif
-
 /*************************************************************************************************
                               variables concerned with Error Handling
 *************************************************************************************************/
@@ -784,6 +774,8 @@ extern struct worker_local Yap_local;
 #define REMOTE(wid)        (&Yap_local)
 #endif
 
+#include "encoding.h"
+
 #include <stdio.h>
 #define YP_FILE		FILE
 #include "hglobals.h"
@@ -859,7 +851,7 @@ LOG0(const char *f, int l, const char *fmt, ...)
 #define __android_log_print( ... )
 #endif
 
-
+#include "GitSHA1.h"
 
 
 #endif /* YAP_H */