655d0e6714
Per request from Mako88, remove unused loadgl typedefs. loadgl.h was imported from elsewhere and defines typedefs for many functions that Descent does not use. Some of these are guarded by WINVER conditionals and, in Mako88's unspecified environment, defining WINVER to expose these results in a build failure because the guarded typedef requires a type that is not defined by the environment. Compensate for that by removing all unused gl typedefs. # Save the results to a file, then run the file separately. This # avoids any chance that sed might try to edit the file while later # searches are still running. git grep 'typedef .*OGLFUNCCALL \*' common/include/loadgl.h | sed -e 's/^.*OGLFUNCCALL \*//' -e 's/).*$//' | while read f; do if ! git grep -q 'DEFVAR\s'"$f"'\>' -- common/include/loadgl.h; then echo "/\\<$f\\>/d" fi done > unused.sed sed -i common/include/loadgl.h -f unused.sed |
||
---|---|---|
.. | ||
editor | ||
3d.h | ||
args.h | ||
byteutil.h | ||
compiler-addressof.h | ||
compiler-array.h | ||
compiler-begin.h | ||
compiler-exchange.h | ||
compiler-integer_sequence.h | ||
compiler-lengthof.h | ||
compiler-make_unique.h | ||
compiler-range_for.h | ||
compiler-static_assert.h | ||
compiler-type_traits.h | ||
console.h | ||
countarray.h | ||
digi_audio.h | ||
digi_mixer.h | ||
digi_mixer_music.h | ||
dsx-ns.h | ||
dxxerror.h | ||
event.h | ||
fmtcheck.h | ||
func.h | ||
fwd-event.h | ||
fwd-gr.h | ||
fwd-partial_range.h | ||
fwd-valptridx.h | ||
fwd-vecmat.h | ||
fwd-window.h | ||
gr.h | ||
grdef.h | ||
hash.h | ||
hmp.h | ||
iff.h | ||
ignorecase.h | ||
internal.h | ||
interp.h | ||
joy.h | ||
jukebox.h | ||
key.h | ||
loadgl.h | ||
makesig.h | ||
maths.h | ||
messagebox.h | ||
mouse.h | ||
ntstring.h | ||
null_sentinel_iterator.h | ||
ogl_extensions.h | ||
ogl_init.h | ||
ogl_sync.h | ||
pack.h | ||
palette.h | ||
partial_range.h | ||
pcx.h | ||
physfs-serial.h | ||
physfs_list.h | ||
physfsx.h | ||
poison.h | ||
pstypes.h | ||
rbaudio.h | ||
reverse.h | ||
rle.h | ||
serial.h | ||
strutil.h | ||
texmap.h | ||
timer.h | ||
u_mem.h | ||
ui.h | ||
valptridx.h | ||
varutil.h | ||
vecmat.h | ||
window.h |