Attachment #231569 for bug #227499

View | Details | Raw Unified | Return to bug 227499
Collapse All | Expand All




#endif

#ifdef __WIN32__
#include "xbase/xbconfigw32.h"
#else
#include "xbase/xbconfig.h"
#endif

#include "xbase/xbase.h"

#ifdef HAVE_IO_H
#include <io.h> 

#include <stdlib.h>
#include <string.h>

#include "xbase/xbexcept.h"

using namespace std;
/*! \file dbf.cpp
*/


Lines 65-71 Link Here

(-)xbase-2.0.0/xbase/dbf.h (-1 / +1 lines)
65	#include <xbase/xtypes.h>	65	#include <xbase/xtypes.h>
66	#include <xbase/xdate.h>	66	#include <xbase/xdate.h>
67		67
68	#include <iostream.h>	68	#include <iostream>
69	#include <stdio.h>	69	#include <stdio.h>
70		70
71	/*! \file dbf.h	71	/*! \file dbf.h

Lines 66-72 Link Here

(-)xbase-2.0.0/xbase/ndx.cpp (-1 / +3 lines)
66	#endif	66	#endif
67		67
68	#include <xbase/xbase.h>	68	#include <xbase/xbase.h>
69	#include <iostream.h>	69	#include <iostream>
70		70
71	#ifdef XB_INDEX_NDX	71	#ifdef XB_INDEX_NDX
72		72
Lines 80-85 Link Here
80		80
81	#include <xbase/xbexcept.h>	81	#include <xbase/xbexcept.h>
82		82
		83	using namespace std;
		84
83	/*! \file ndx.cpp	85	/*! \file ndx.cpp
84	*/	86	*/
85		87

Lines 53-58 Link Here

(-)xbase-2.0.0/xbase/ntx.h (-1 / +3 lines)
53	#include <xbase/xbase.h>	53	#include <xbase/xbase.h>
54	#include <string.h>	54	#include <string.h>
55		55
		56	using namespace std;
		57
56	/*! \file ntx.h	58	/*! \file ntx.h
57	*/	59	*/
58		60
Lines 218-224 Link Here
218	xbShort KeyExists( char * Key ) { return FindKey( Key, strlen( Key ), 0 ); }	220	xbShort KeyExists( char * Key ) { return FindKey( Key, strlen( Key ), 0 ); }
219	xbShort KeyExists( xbDouble );	221	xbShort KeyExists( xbDouble );
220		222
221	xbShort xbNtx::AllocKeyBufs(void);	223	xbShort AllocKeyBufs(void);
222		224
223	virtual void GetExpression(char *buf, int len);	225	virtual void GetExpression(char *buf, int len);
224	};	226	};

Lines 59-68 Link Here

(-)xbase-2.0.0/xbase/stack.cpp (-1 / +3 lines)
59		59
60	#include <string.h>	60	#include <string.h>
61	#include <stdlib.h>	61	#include <stdlib.h>
62	#include <iostream.h>	62	#include <iostream>
63		63
64	#include <xbase/xstack.h>	64	#include <xbase/xstack.h>
65		65
		66	using namespace std;
		67
66	/*! \file stack.cpp	68	/*! \file stack.cpp
67	*/	69	*/
68		70

Line 0 Link Here

(-)xbase-2.0.0/xbase/stamp-h (+1 lines)
	1	timestamp

Lines 1-4 Link Here

(-)xbase-2.0.0/xbase/xbase.h (-1 / +1 lines)
1	/* $Id: xbase.h,v 1.19 2001/06/26 23:43:11 dbryson Exp $	1	/* $Id: xbase.h.in,v 1.5 2000/11/10 19:30:29 dbryson Exp $
2		2
3	Xbase project source code	3	Xbase project source code
4		4

Lines 52-63 Link Here

(-)xbase-2.0.0/xbase/xbstring.h (-2 / +4 lines)
52	#ifdef __WIN32__	52	#ifdef __WIN32__
53	#include <xbase/xbconfigw32.h>	53	#include <xbase/xbconfigw32.h>
54	#else	54	#else
55	#include <xbase/xbconfig.h>	55	#include "xbase/xbconfig.h"
56	#endif	56	#endif
57		57
58	#include <stdlib.h>	58	#include <stdlib.h>
59	#include <iostream.h>	59	#include <iostream>
60		60
		61	#pragma once
		62	using namespace std;
61	/*! \file xbstring.h	63	/*! \file xbstring.h
62	*/	64	*/
63		65

Return to bug 227499

Lines 61-72 Link Here

(-)xbase-2.0.0/xbase/dbf.cpp (-4 / +5 lines)
61	#endif	61	#endif
62		62
63	#ifdef __WIN32__	63	#ifdef __WIN32__
64	#include <xbase/xbconfigw32.h>	64	#include "xbase/xbconfigw32.h"
65	#else	65	#else
66	#include <xbase/xbconfig.h>	66	#include "xbase/xbconfig.h"
67	#endif	67	#endif
68		68
69	#include <xbase/xbase.h>	69	#include "xbase/xbase.h"
70		70
71	#ifdef HAVE_IO_H	71	#ifdef HAVE_IO_H
72	#include <io.h>	72	#include <io.h>
Lines 77-84 Link Here
77	#include <stdlib.h>	77	#include <stdlib.h>
78	#include <string.h>	78	#include <string.h>
79		79
80	#include <xbase/xbexcept.h>	80	#include "xbase/xbexcept.h"
81		81
		82	using namespace std;
82	/*! \file dbf.cpp	83	/*! \file dbf.cpp
83	*/	84	*/
84		85