[Kde-cygwin-cvs] CVS: qt-3/src/moc moc_lex.cpp,1.1.1.16,1.1.1.17
Status: Inactive
Brought to you by:
habacker
From: Christian E. <che...@us...> - 2005-09-30 18:13:28
|
Update of /cvsroot/kde-cygwin/qt-3/src/moc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6831/src/moc Modified Files: Tag: QT_WIN32_3_3_BRANCH moc_lex.cpp Log Message: reapply patches which were lost during my not so good update to 3.3.5 Index: moc_lex.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/moc/moc_lex.cpp,v retrieving revision 1.1.1.16 retrieving revision 1.1.1.17 diff -u -r1.1.1.16 -r1.1.1.17 --- moc_lex.cpp 22 Sep 2005 12:53:43 -0000 1.1.1.16 +++ moc_lex.cpp 30 Sep 2005 16:58:31 -0000 1.1.1.17 @@ -1046,7 +1046,7 @@ #define IN_PROPERTY 12 #define IN_CLASSINFO 13 -#ifndef YY_NO_UNISTD_H +#if !defined (YY_NO_UNISTD_H) && !defined(Q_OS_WIN32) /* Special case for "unistd.h", since it is non-ANSI. We include it way * down here because we want the user's section 1 to have been scanned first. * The user has a chance to override it with an option. |