svn commit: samba r18322 - in branches/SAMBA_4_0/source: heimdal/lib/asn1 heimdal/lib/com_err script

[tridge at samba.org]

Author: tridge
Date: 2006-09-10 10:02:10 +0000 (Sun, 10 Sep 2006)
New Revision: 18322

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18322

Log:

fixed a compilation problem on AIX caused by lex not putting config.h
first. That leads to a conflicting define for lseek() due to
_LARGE_FILES being defined after standards headers are included

Modified:
   branches/SAMBA_4_0/source/heimdal/lib/asn1/lex.c
   branches/SAMBA_4_0/source/heimdal/lib/com_err/lex.c
   branches/SAMBA_4_0/source/script/lex_compile.sh


Changeset:
Modified: branches/SAMBA_4_0/source/heimdal/lib/asn1/lex.c
===================================================================
--- branches/SAMBA_4_0/source/heimdal/lib/asn1/lex.c	2006-09-10 10:00:42 UTC (rev 18321)
+++ branches/SAMBA_4_0/source/heimdal/lib/asn1/lex.c	2006-09-10 10:02:10 UTC (rev 18322)
@@ -1,3 +1,4 @@
+#include "config.h"
 
 #line 3 "lex.yy.c"
 
@@ -1905,7 +1906,7 @@
 
 		/* Read in more data. */
 		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
-			(yy_n_chars), num_to_read );
+			(yy_n_chars), (size_t) num_to_read );
 
 		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
 		}

Modified: branches/SAMBA_4_0/source/heimdal/lib/com_err/lex.c
===================================================================
--- branches/SAMBA_4_0/source/heimdal/lib/com_err/lex.c	2006-09-10 10:00:42 UTC (rev 18321)
+++ branches/SAMBA_4_0/source/heimdal/lib/com_err/lex.c	2006-09-10 10:02:10 UTC (rev 18322)
@@ -1,3 +1,4 @@
+#include "config.h"
 
 #line 3 "lex.yy.c"
 

Modified: branches/SAMBA_4_0/source/script/lex_compile.sh
===================================================================
--- branches/SAMBA_4_0/source/script/lex_compile.sh	2006-09-10 10:00:42 UTC (rev 18321)
+++ branches/SAMBA_4_0/source/script/lex_compile.sh	2006-09-10 10:02:10 UTC (rev 18322)
@@ -19,7 +19,9 @@
 TOP=`pwd`
 if cd $dir && $LEX $file; then
 	if [ -r $base.yy.c ];then
-		sed '/^#/ s|$base.yy\.c|$DEST|' $base.yy.c > $base.c
+	        # we must guarantee that config.h comes first
+	        echo "#include \"config.h\"" > $base.c
+		sed '/^#/ s|$base.yy\.c|$DEST|' $base.yy.c >> $base.c
 		rm -f $base.yy.c
 	fi
 fi