You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by ma...@apache.org on 2011/08/23 01:24:26 UTC
[lucy-commits] svn commit: r1160496 - in /incubator/lucy/branches/0.2: ./ charmonizer/
core/Lucy/ core/Lucy/Object/ core/Lucy/Search/ core/Lucy/Store/
core/Lucy/Test/ core/Lucy/Test/Analysis/ core/Lucy/Test/Object/
core/Lucy/Test/Search/ core/Lucy/Util/ core/LucyX/Se...
Author: marvin
Date: Mon Aug 22 23:24:25 2011
New Revision: 1160496
URL: http://svn.apache.org/viewvc?rev=1160496&view=rev
Log:
LUCY-175 Pound-include stdarg.h early on.
Since core/Lucy/Test.cfh uses va_list arguments, stdarg.h is required.
Include it early on, within charmony.h, since Clownfish *always* allows
va_list.
Modified:
incubator/lucy/branches/0.2/ (props changed)
incubator/lucy/branches/0.2/charmonizer/charmonize.c
incubator/lucy/branches/0.2/core/Lucy/Object/CharBuf.cfh
incubator/lucy/branches/0.2/core/Lucy/Search/PhraseQuery.c
incubator/lucy/branches/0.2/core/Lucy/Store/DirHandle.c
incubator/lucy/branches/0.2/core/Lucy/Store/FSFileHandle.c
incubator/lucy/branches/0.2/core/Lucy/Store/FileHandle.c
incubator/lucy/branches/0.2/core/Lucy/Test.c
incubator/lucy/branches/0.2/core/Lucy/Test/Analysis/TestSnowballStopFilter.c
incubator/lucy/branches/0.2/core/Lucy/Test/Object/TestCharBuf.c
incubator/lucy/branches/0.2/core/Lucy/Test/Search/TestQueryParser.c
incubator/lucy/branches/0.2/core/Lucy/Test/Search/TestQueryParserLogic.c
incubator/lucy/branches/0.2/core/Lucy/Test/Search/TestQueryParserSyntax.c
incubator/lucy/branches/0.2/core/Lucy/Test/TestUtils.c
incubator/lucy/branches/0.2/core/Lucy/Util/Debug.c
incubator/lucy/branches/0.2/core/LucyX/Search/ProximityQuery.c
Propchange: incubator/lucy/branches/0.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 22 23:24:25 2011
@@ -1 +1 @@
-/incubator/lucy/trunk:1148076,1148119
+/incubator/lucy/trunk:1148076,1148119,1159913
Modified: incubator/lucy/branches/0.2/charmonizer/charmonize.c
URL: http://svn.apache.org/viewvc/incubator/lucy/branches/0.2/charmonizer/charmonize.c?rev=1160496&r1=1160495&r2=1160496&view=diff
==============================================================================
--- incubator/lucy/branches/0.2/charmonizer/charmonize.c (original)
+++ incubator/lucy/branches/0.2/charmonizer/charmonize.c Mon Aug 22 23:24:25 2011
@@ -66,6 +66,11 @@ int main(int argc, char **argv) {
"#endif\n\n"
);
chaz_ConfWriter_append_conf(
+ "#ifdef CHY_HAS_STDARG_H\n"
+ " #include <stdarg.h>\n"
+ "#endif\n\n"
+ );
+ chaz_ConfWriter_append_conf(
"#ifdef CHY_HAS_ALLOCA_H\n"
" #include <alloca.h>\n"
"#elif defined(CHY_HAS_MALLOC_H)\n"
Modified: incubator/lucy/branches/0.2/core/Lucy/Object/CharBuf.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/branches/0.2/core/Lucy/Object/CharBuf.cfh?rev=1160496&r1=1160495&r2=1160496&view=diff
==============================================================================
--- incubator/lucy/branches/0.2/core/Lucy/Object/CharBuf.cfh (original)
+++ incubator/lucy/branches/0.2/core/Lucy/Object/CharBuf.cfh Mon Aug 22 23:24:25 2011
@@ -16,10 +16,6 @@
parcel Lucy;
-__C__
-#include <stdarg.h>
-__END_C__
-
/**
* Growable buffer holding Unicode characters.
*/
Modified: incubator/lucy/branches/0.2/core/Lucy/Search/PhraseQuery.c
URL: http://svn.apache.org/viewvc/incubator/lucy/branches/0.2/core/Lucy/Search/PhraseQuery.c?rev=1160496&r1=1160495&r2=1160496&view=diff
==============================================================================
--- incubator/lucy/branches/0.2/core/Lucy/Search/PhraseQuery.c (original)
+++ incubator/lucy/branches/0.2/core/Lucy/Search/PhraseQuery.c Mon Aug 22 23:24:25 2011
@@ -16,7 +16,6 @@
#define C_LUCY_PHRASEQUERY
#define C_LUCY_PHRASECOMPILER
-#include <stdarg.h>
#include "Lucy/Util/ToolSet.h"
Modified: incubator/lucy/branches/0.2/core/Lucy/Store/DirHandle.c
URL: http://svn.apache.org/viewvc/incubator/lucy/branches/0.2/core/Lucy/Store/DirHandle.c?rev=1160496&r1=1160495&r2=1160496&view=diff
==============================================================================
--- incubator/lucy/branches/0.2/core/Lucy/Store/DirHandle.c (original)
+++ incubator/lucy/branches/0.2/core/Lucy/Store/DirHandle.c Mon Aug 22 23:24:25 2011
@@ -15,7 +15,6 @@
*/
#define C_LUCY_DIRHANDLE
-#include <stdarg.h>
#include "Lucy/Util/ToolSet.h"
#include "Lucy/Store/DirHandle.h"
Modified: incubator/lucy/branches/0.2/core/Lucy/Store/FSFileHandle.c
URL: http://svn.apache.org/viewvc/incubator/lucy/branches/0.2/core/Lucy/Store/FSFileHandle.c?rev=1160496&r1=1160495&r2=1160496&view=diff
==============================================================================
--- incubator/lucy/branches/0.2/core/Lucy/Store/FSFileHandle.c (original)
+++ incubator/lucy/branches/0.2/core/Lucy/Store/FSFileHandle.c Mon Aug 22 23:24:25 2011
@@ -21,7 +21,6 @@
#include <errno.h>
#include <stdio.h>
#include <fcntl.h> // open, POSIX flags
-#include <stdarg.h>
#ifdef CHY_HAS_UNISTD_H
#include <unistd.h> // close
Modified: incubator/lucy/branches/0.2/core/Lucy/Store/FileHandle.c
URL: http://svn.apache.org/viewvc/incubator/lucy/branches/0.2/core/Lucy/Store/FileHandle.c?rev=1160496&r1=1160495&r2=1160496&view=diff
==============================================================================
--- incubator/lucy/branches/0.2/core/Lucy/Store/FileHandle.c (original)
+++ incubator/lucy/branches/0.2/core/Lucy/Store/FileHandle.c Mon Aug 22 23:24:25 2011
@@ -14,8 +14,6 @@
* limitations under the License.
*/
-#include <stdarg.h>
-
#define C_LUCY_FILEHANDLE
#include "Lucy/Util/ToolSet.h"
Modified: incubator/lucy/branches/0.2/core/Lucy/Test.c
URL: http://svn.apache.org/viewvc/incubator/lucy/branches/0.2/core/Lucy/Test.c?rev=1160496&r1=1160495&r2=1160496&view=diff
==============================================================================
--- incubator/lucy/branches/0.2/core/Lucy/Test.c (original)
+++ incubator/lucy/branches/0.2/core/Lucy/Test.c Mon Aug 22 23:24:25 2011
@@ -15,7 +15,6 @@
*/
#include <stdio.h>
-#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
Modified: incubator/lucy/branches/0.2/core/Lucy/Test/Analysis/TestSnowballStopFilter.c
URL: http://svn.apache.org/viewvc/incubator/lucy/branches/0.2/core/Lucy/Test/Analysis/TestSnowballStopFilter.c?rev=1160496&r1=1160495&r2=1160496&view=diff
==============================================================================
--- incubator/lucy/branches/0.2/core/Lucy/Test/Analysis/TestSnowballStopFilter.c (original)
+++ incubator/lucy/branches/0.2/core/Lucy/Test/Analysis/TestSnowballStopFilter.c Mon Aug 22 23:24:25 2011
@@ -16,7 +16,6 @@
#define C_LUCY_TESTSNOWBALLSTOPFILTER
#include "Lucy/Util/ToolSet.h"
-#include <stdarg.h>
#include "Lucy/Test.h"
#include "Lucy/Test/Analysis/TestSnowballStopFilter.h"
Modified: incubator/lucy/branches/0.2/core/Lucy/Test/Object/TestCharBuf.c
URL: http://svn.apache.org/viewvc/incubator/lucy/branches/0.2/core/Lucy/Test/Object/TestCharBuf.c?rev=1160496&r1=1160495&r2=1160496&view=diff
==============================================================================
--- incubator/lucy/branches/0.2/core/Lucy/Test/Object/TestCharBuf.c (original)
+++ incubator/lucy/branches/0.2/core/Lucy/Test/Object/TestCharBuf.c Mon Aug 22 23:24:25 2011
@@ -16,7 +16,6 @@
#define C_LUCY_TESTCHARBUF
#include "Lucy/Util/ToolSet.h"
-#include <stdarg.h>
#include <string.h>
#include <stdio.h>
Modified: incubator/lucy/branches/0.2/core/Lucy/Test/Search/TestQueryParser.c
URL: http://svn.apache.org/viewvc/incubator/lucy/branches/0.2/core/Lucy/Test/Search/TestQueryParser.c?rev=1160496&r1=1160495&r2=1160496&view=diff
==============================================================================
--- incubator/lucy/branches/0.2/core/Lucy/Test/Search/TestQueryParser.c (original)
+++ incubator/lucy/branches/0.2/core/Lucy/Test/Search/TestQueryParser.c Mon Aug 22 23:24:25 2011
@@ -16,7 +16,6 @@
#define C_LUCY_TESTQUERYPARSER
#include "Lucy/Util/ToolSet.h"
-#include <stdarg.h>
#include <string.h>
#include "Lucy/Test/Search/TestQueryParser.h"
Modified: incubator/lucy/branches/0.2/core/Lucy/Test/Search/TestQueryParserLogic.c
URL: http://svn.apache.org/viewvc/incubator/lucy/branches/0.2/core/Lucy/Test/Search/TestQueryParserLogic.c?rev=1160496&r1=1160495&r2=1160496&view=diff
==============================================================================
--- incubator/lucy/branches/0.2/core/Lucy/Test/Search/TestQueryParserLogic.c (original)
+++ incubator/lucy/branches/0.2/core/Lucy/Test/Search/TestQueryParserLogic.c Mon Aug 22 23:24:25 2011
@@ -17,7 +17,6 @@
#define C_LUCY_TESTQUERYPARSERLOGIC
#define C_LUCY_TESTQUERYPARSER
#include "Lucy/Util/ToolSet.h"
-#include <stdarg.h>
#include <string.h>
#include "Lucy/Test.h"
Modified: incubator/lucy/branches/0.2/core/Lucy/Test/Search/TestQueryParserSyntax.c
URL: http://svn.apache.org/viewvc/incubator/lucy/branches/0.2/core/Lucy/Test/Search/TestQueryParserSyntax.c?rev=1160496&r1=1160495&r2=1160496&view=diff
==============================================================================
--- incubator/lucy/branches/0.2/core/Lucy/Test/Search/TestQueryParserSyntax.c (original)
+++ incubator/lucy/branches/0.2/core/Lucy/Test/Search/TestQueryParserSyntax.c Mon Aug 22 23:24:25 2011
@@ -17,7 +17,6 @@
#define C_LUCY_TESTQUERYPARSERSYNTAX
#define C_LUCY_TESTQUERYPARSER
#include "Lucy/Util/ToolSet.h"
-#include <stdarg.h>
#include <string.h>
#include "Lucy/Test.h"
Modified: incubator/lucy/branches/0.2/core/Lucy/Test/TestUtils.c
URL: http://svn.apache.org/viewvc/incubator/lucy/branches/0.2/core/Lucy/Test/TestUtils.c?rev=1160496&r1=1160495&r2=1160496&view=diff
==============================================================================
--- incubator/lucy/branches/0.2/core/Lucy/Test/TestUtils.c (original)
+++ incubator/lucy/branches/0.2/core/Lucy/Test/TestUtils.c Mon Aug 22 23:24:25 2011
@@ -16,7 +16,6 @@
#define C_LUCY_TESTUTILS
#include "Lucy/Util/ToolSet.h"
-#include <stdarg.h>
#include <string.h>
#include "Lucy/Test/TestUtils.h"
Modified: incubator/lucy/branches/0.2/core/Lucy/Util/Debug.c
URL: http://svn.apache.org/viewvc/incubator/lucy/branches/0.2/core/Lucy/Util/Debug.c?rev=1160496&r1=1160495&r2=1160496&view=diff
==============================================================================
--- incubator/lucy/branches/0.2/core/Lucy/Util/Debug.c (original)
+++ incubator/lucy/branches/0.2/core/Lucy/Util/Debug.c Mon Aug 22 23:24:25 2011
@@ -26,7 +26,6 @@ int32_t Debug_num_globals = 0;
#if DEBUG_ENABLED
-#include <stdarg.h>
#include <ctype.h>
#include <string.h>
#include <stdlib.h>
Modified: incubator/lucy/branches/0.2/core/LucyX/Search/ProximityQuery.c
URL: http://svn.apache.org/viewvc/incubator/lucy/branches/0.2/core/LucyX/Search/ProximityQuery.c?rev=1160496&r1=1160495&r2=1160496&view=diff
==============================================================================
--- incubator/lucy/branches/0.2/core/LucyX/Search/ProximityQuery.c (original)
+++ incubator/lucy/branches/0.2/core/LucyX/Search/ProximityQuery.c Mon Aug 22 23:24:25 2011
@@ -16,7 +16,6 @@
#define C_LUCY_PROXIMITYQUERY
#define C_LUCY_PROXIMITYCOMPILER
-#include <stdarg.h>
#include "Lucy/Util/ToolSet.h"