fix incompatibilities with string patch

C/write.c

@@ -197,8 +197,8 @@ write_mpint(MP_INT *big, wrf writewch) {
 static void 
 writebig(Term t, int p, int depth, int rinfixarg, struct write_globs *wglb, struct rewind_term *rwt)
 {
-#ifdef USE_GMP
   CELL *pt = RepAppl(t)+1;
+#ifdef USE_GMP
   if (pt[0] == BIG_INT) 
   {
     MP_INT *big = Yap_BigIntOfTerm(t);

H/Yap.h

@@ -328,6 +328,8 @@ typedef unsigned char *CODEADDR;
 #define CellSize     sizeof(CELL)
 #define SmallSize    sizeof(SMALLUNSGN)
 
+#define ALIGN_YAPTYPE(X,TYPE) (((CELL)(X)+(sizeof(TYPE)-1)) & ~(sizeof(TYPE)-1))
+
 /*************************************************************************************************
                                         type casting macros
 *************************************************************************************************/

H/alloc.h

@@ -74,8 +74,6 @@ typedef	struct FREEB {
 
 #define AdjustSize(X)	((X+YAP_ALIGN) & YAP_ALIGNMASK)
 
-#define ALIGN_YAPTYPE(X,TYPE) (((CELL)(X)+(sizeof(TYPE)-1)) & ~(sizeof(TYPE)-1))
-
 /* SIZE should be a power of 2 */
 #define ALIGN_SIZE(X,SIZE) (((CELL)(X)+((SIZE)-1)) & ~((SIZE)-1))