Andre Poenitz wrote:
> On Tue, May 03, 2005 at 08:54:25AM -0400, Rob Bearman wrote:
>> Based on yesterday's changes, could this patch be committed please? It
>> contains the updates to config.h and lyx.vcproj in the development\win32
>> directory.
>
> I don't think it is necessary to have DOS lin
On Tue, May 03, 2005 at 08:54:25AM -0400, Rob Bearman wrote:
> Based on yesterday's changes, could this patch be committed please? It
> contains the updates to config.h and lyx.vcproj in the development\win32
> directory.
I don't think it is necessary to have DOS line endings in our source
files.
Rob Bearman wrote:
> Based on yesterday's changes, could this patch be committed please? It
> contains the updates to config.h and lyx.vcproj in the development\win32
> directory.
Done.
--
Angus
Based on yesterday's changes, could this patch be committed please? It
contains the updates to config.h and lyx.vcproj in the development\win32
directory.
Thanks
Rob
msvc.diff
Description: msvc.diff
> Given that we have:
> src/frontends/qt2/QLyXKeySym.C:
> typedef map EncodingMap;
> EncodingMap encoding_map;
>
> The change below is obviously an improvement, even though
> there's no reason
> why a sane compiler shouldn't compile the original too.
>
> Nonetheless, can I ask you to con
Rob Bearman wrote:
> I'm including my revised version of win32_kludge.diff.
Given that we have:
src/frontends/qt2/QLyXKeySym.C:
typedef map EncodingMap;
EncodingMap encoding_map;
The change below is obviously an improvement, even though there's no reason
why a sane compiler shouldn't comp
> Rob, what happens if you define CXX_GLOBAL_CSTD in your config.h ?
> Does it mean you no longer need these two kludges, or does it
> break things
> elsewhere?
>
> Index: src/DepTable.C
> ===
> RCS file: /usr/local/lyx/cvsroot/lyx-d
Rob Bearman wrote:
> In case you're interested in my config.h and if it helps resolve any
> confusion from my previous message, I'm including that here for your
> reference.
>
> Thanks
> Rob
Rob, what happens if you define CXX_GLOBAL_CSTD in your config.h ?
Does it mean you no longer need these
> Anyway, I read it that win32_kludge.diff should now be something like
> the attached. Correct?
>
> Angus
>
>
Yes, that's just what I have.
Rob
On Monday 02 May 2005 21:46, Rob Bearman wrote:
> > > > Looking at the other bits of win32_kludge.diff, can you
> > > > confirm that 'time'
> > > > and 'isalpha' are not in namespace std?
> > >
> > > Correct.
> >
> > I goofed. 'isalpha' *is* in namespace std.
>
> Argh. The compiler doesn't agree wi
> Please add these (with appropriate define/undef) to your config.h:
>
> /* Define to 1 if you have the header file. */
> /* #undef HAVE_SYS_UTIME_H */
> /* Define to 1 if you have the header file. */
> #define HAVE_UTIME_H 1
>
> and check that the attached rob.diff does the job. (It may be
>
Rob Bearman wrote:
>> What, exactly, do you need from windows.h here? Do you have a
>> sys/utime.h ?
>>
>> --- src/buffer.C18 Apr 2005 17:43:08 - 1.615
>> +++ src/buffer.C18 Apr 2005 17:37:02 -
>> @@ -78,7 +78,11 @@
>> #include
>> #include
>>
>> -#include
>> +#i
> > > Looking at the other bits of win32_kludge.diff, can you
> > > confirm that 'time'
> > > and 'isalpha' are not in namespace std?
> > >
> >
> > Correct.
>
> I goofed. 'isalpha' *is* in namespace std.
>
Argh. The compiler doesn't agree with the docs and says isalpha is not a
member of std.
> > Looking at the other bits of win32_kludge.diff, can you
> > confirm that 'time'
> > and 'isalpha' are not in namespace std?
> >
>
> Correct.
I goofed. 'isalpha' *is* in namespace std.
> I think that you should modify your config.h so that
> HAVE_SYS_TIME_H is not
> defined...
Ok...
>
> --- src/frontends/LyXView.C 2005/04/26 10:30:22 1.52
> +++ src/frontends/LyXView.C 2005/04/26 15:39:37
> @@ -39,8 +39,10 @@
>
> #include
>
> +#ifndef _WIN32
> #ifdef HAVE_SY
> I'm including my revised version of win32_kludge.diff.
I think that you should modify your config.h so that HAVE_SYS_TIME_H is not
defined...
--- src/frontends/LyXView.C 2005/04/26 10:30:22 1.52
+++ src/frontends/LyXView.C 2005/04/26 15:39:37
@@ -39,8 +39,10 @@
#include
+#ifnd
Angus Leeming wrote:
>> Would you like me to package things up for a commit (lyx.vcproj,
>> win32_kludge.diff, config.h), or do you want me to try other things
>> first?
>
> Let's get the tests right for these things above first, then we'll go on
> to see what we need to do to get rid of win32_klu
Rob Bearman wrote:
> Thanks. I've got things building now by adding Spellbase.C (not sure why
> it wasn't there in the first place),
I forgot to tell you to add it perhaps?
> and turning off mkfifo in the config.h file. I still have dup2,
> select, socket, and ispell turned off.
Looking at supp
> How interesting! HAVE_SELECT and HAVE_SOCKET are definitely
> not defined
> using mingw/minsys.
>
> HAVE_DUP2 is defined on mingw/minsys (my very bad), so we really need
> another test to prevent USE_ISPELL from being defined. I'll
> think on it.
>
> Looking at your error messages below, I'm
> Looking at your error messages below, I'm frankly surprised
> by things going
> wrong in lyxserver.C Why are you compiling code invoking
> mkfifo and fcntl.
> Is HAVE_MKFIFO defined?
I'm only using what was defined in the original commit of config.h (I've
always depended on the kindness of str
Rob Bearman wrote:
>> the changes I've just committed will probably break your
>> build.
> I've made these undefined in config.h and verified that there's nothing
> else new. Note that dup2, select, and socket do exist for this
> environment. Am I setting these to undefined just to make sure serv
Rob Bearman wrote:
> In case you're interested in my config.h and if it helps resolve any
> confusion from my previous message, I'm including that here for your
> reference.
Is this true?
/* Define to 1 if you have the `mkfifo' function. */
#define HAVE_MKFIFO 1
--
Angus
In case you're interested in my config.h and if it helps resolve any
confusion from my previous message, I'm including that here for your
reference.
Thanks
Rob
config.h
Description: config.h
> the changes I've just committed will probably break your
> build. To help you
> resurrect things, I attach the current config.h.in from which
> config.h is
> generated. I also attach the changes from the previous
> config.h.in. The
> new macros HAVE_DUP2, HAVE_SELECT, HAVE_SOCKET and USE_ISPEL
24 matches
Mail list logo
