patch 5132 breaks pws-6

patch 5132 breaks pws-6

[Helmut Jarausch]

Hi,

first patches 5132 and 5133 are hard to apply. What 'patch' is required
for that.

Having applied it (by hand), zsh fails to build.

In  Src/init.c

the preprocessor variable UNLINKED_XMOD_zle  gets defined in 
zshxmods.h

but is used already in  init.pro, which gets included by zsh.mdh.

But placing 
#include "zshxmods.h"

before
#include "zsh.mdh"

doesn't work either, since only "zsh.mdh" includes  "config.h"
which defines DYNAMIC  which is referenced in "zshxmods.h"

So one has to break this circular dependency.

Helmut.


(Here on IRIX 6.2)

PATCH 3.1.5-pws-6 + 5132: Re: patch 5132 breaks pws-6

[Peter Stephenson]

Helmut Jarausch wrote:
> Hi,
> 
> first patches 5132 and 5133 are hard to apply. What 'patch' is required
> for that.

I think it was just the ChangeLog, which I haven't been keeping up to
date anyway, so I removed those hunks.

> Having applied it (by hand), zsh fails to build.
> 
> In  Src/init.c
> 
> the preprocessor variable UNLINKED_XMOD_zle  gets defined in 
> zshxmods.h
> 
> but is used already in  init.pro, which gets included by zsh.mdh.

This time, I think there's an easy fix:  the definition we want is in
the non-GLOBAL_PROTOTYPES section of init.pro, which isn't used from
zsh.mdh, only when init.pro is directly included.  So the answer is
simply to move down the #include for that.  Luckily this doesn't seem a
problem in other source files.  I think this is a good system, so I'll
put this in pws-7 whenever.

--- Src/init.c.proto	Mon Feb  1 09:42:01 1999
+++ Src/init.c	Mon Feb  1 13:40:57 1999
@@ -28,10 +28,11 @@
  */
 
 #include "zsh.mdh"
-#include "init.pro"
 
 #include "zshpaths.h"
 #include "zshxmods.h"
+
+#include "init.pro"
 
 /**/
 int noexitct = 0;

-- 
Peter Stephenson <pws@ibmth.df.unipi.it>       Tel: +39 050 844536
WWW:  http://www.ifh.de/~pws/
Dipartimento di Fisica, Via Buonarroti 2, 56127 Pisa, Italy

Re: patch 5132 breaks pws-6

[Bart Schaefer]

On Feb 1,  1:03pm, Helmut Jarausch wrote:
} Subject: patch 5132  breaks pws-6
}
} first patches 5132 and 5133 are hard to apply.

What were patches 5132 and 5133?  I don't seem to have them, and I thought
I was applying everything that went by.  (The zsh.org archives are still
out of date waiting for the new list homesite to make a decision on how
the article numbering will be done).

-- 
Bart Schaefer                                 Brass Lantern Enterprises
http://www.well.com/user/barts              http://www.brasslantern.com