Skip to content

Commit d574e15

Browse files
committed
datetime.bi: Make smaller by eliminating duplicates
Previously, the header's procedure declarations were split in -lang qb/fb versions, with the main difference being that for -lang qb it used Long instead of Integer. Now that the header was made ready for 64bit, the -lang fb version uses Long instead of Integer too, so they can be merged. Only the DateDiff() declaration remains different for -lang qb/fb, because it needs to use either __LongInt or LongInt.
1 parent d34694d commit d574e15

File tree

1 file changed

+2
-70
lines changed

1 file changed

+2
-70
lines changed

inc/datetime.bi

Lines changed: 2 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
#define fbFriday 6
1818
#define fbSaturday 7
1919

20-
#if __FB_LANG__ = "qb"
21-
2220
declare function DateSerial alias "fb_DateSerial" _
2321
( byval year as long, _
2422
byval month as long, _
@@ -74,85 +72,21 @@ declare function DatePart alias "fb_DatePart" _
7472
byval FirstDayOfWeek as long = fbUseSystem, _
7573
byval FirstDayOfYear as long = fbUseSystem ) as long
7674

75+
#if __FB_LANG__ = "qb"
7776
declare function DateDiff alias "fb_DateDiff" _
7877
( byref interval as const string, _
7978
byval serial1 as double, _
8079
byval serial2 as double, _
8180
byval FirstDayOfWeek as long = fbUseSystem, _
8281
byval FirstDayOfYear as long = fbUseSystem ) as __longint
83-
84-
declare function MonthName alias "fb_MonthName" _
85-
( byval month as long, _
86-
byval abbreviate as long = 0 ) as string
87-
88-
declare function WeekdayName alias "fb_WeekdayName" _
89-
( byval weekday as long, _
90-
byval abbreviate as long = 0, _
91-
byval FirstDayOfWeek as long = fbUseSystem ) as string
92-
9382
#else
94-
95-
declare function DateSerial alias "fb_DateSerial" _
96-
( byval year as long, _
97-
byval month as long, _
98-
byval day as long ) as long
99-
100-
declare function DateValue alias "fb_DateValue" _
101-
( byref s as const string ) as long
102-
103-
declare function IsDate alias "fb_IsDate" _
104-
( byref s as const string ) as long
105-
106-
declare function Year alias "fb_Year" _
107-
( byval serial as double ) as long
108-
109-
declare function Month alias "fb_Month" _
110-
( byval serial as double ) as long
111-
112-
declare function Day alias "fb_Day" _
113-
( byval serial as double ) as long
114-
115-
declare function Weekday alias "fb_Weekday" _
116-
( byval serial as double, _
117-
byval FirstDayOfWeek as long = fbUseSystem ) as long
118-
119-
declare function TimeSerial alias "fb_TimeSerial" _
120-
( byval hour as long, _
121-
byval minute as long, _
122-
byval second as long ) as double
123-
124-
declare function TimeValue alias "fb_TimeValue" _
125-
( byref s as const string ) as double
126-
127-
declare function Hour alias "fb_Hour" _
128-
( byval serial as double ) as long
129-
130-
declare function Minute alias "fb_Minute" _
131-
( byval serial as double ) as long
132-
133-
declare function Second alias "fb_Second" _
134-
( byval serial as double ) as long
135-
136-
declare function Now alias "fb_Now" _
137-
( ) as double
138-
139-
declare function DateAdd alias "fb_DateAdd" _
140-
( byref interval as const string, _
141-
byval number as double, _
142-
byval serial as double ) as double
143-
144-
declare function DatePart alias "fb_DatePart" _
145-
( byref interval as const string, _
146-
byval serial as double, _
147-
byval FirstDayOfWeek as long = fbUseSystem, _
148-
byval FirstDayOfYear as long = fbUseSystem ) as long
149-
15083
declare function DateDiff alias "fb_DateDiff" _
15184
( byref interval as const string, _
15285
byval serial1 as double, _
15386
byval serial2 as double, _
15487
byval FirstDayOfWeek as long = fbUseSystem, _
15588
byval FirstDayOfYear as long = fbUseSystem ) as longint
89+
#endif
15690

15791
declare function MonthName alias "fb_MonthName" _
15892
( byval month as long, _
@@ -164,5 +98,3 @@ declare function WeekdayName alias "fb_WeekdayName" _
16498
byval FirstDayOfWeek as long = fbUseSystem ) as string
16599

166100
#endif
167-
168-
#endif

0 commit comments

Comments
 (0)