Package: projectl / 1.001.dfsg1-7

imports.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
Description: port import/ code to D language version 2
  With this patch the code is accapted by GDC 4.8 without triggering deprecation
  warnings/errors.
Author: Peter De Wachter <pdewacht@gmail.com>

--- a/import/SDL_audio.d
+++ b/import/SDL_audio.d
@@ -24,6 +24,7 @@
 import SDL_error;
 import SDL_rwops;
 import SDL_byteorder;
+import std.string;
 
 extern(C):
 
@@ -42,7 +43,7 @@
 	   Once the callback returns, the buffer will no longer be valid.
 	   Stereo samples are stored in a LRLRLR ordering.
 	*/
-	void (*callback)(void *userdata, Uint8 *stream, int len);
+	void function(void *userdata, Uint8 *stream, int len) callback;
 	void  *userdata;
 }
 
@@ -74,7 +75,7 @@
 	int    len_cvt;			/* Length of converted audio buffer */
 	int    len_mult;		/* buffer must be len*len_mult big */
 	double len_ratio; 	/* Given len, final size is len*len_ratio */
-	void (*filters[10])(SDL_AudioCVT *cvt, Uint16 format);
+	void function(SDL_AudioCVT *cvt, Uint16 format)[10] filters;
 	int filter_index;		/* Current audio conversion function */
 }
 
@@ -161,7 +162,7 @@
  * This function loads a WAVE from the data source, automatically freeing
  * that source if 'freesrc' is non-zero.  For example, to load a WAVE file,
  * you could do:
- *	SDL_LoadWAV_RW(SDL_RWFromFile("sample.wav", "rb"), 1, ...);
+ *	SDL_LoadWAV_RW(SDL_RWFromFile("sample.wav", toStringz("rb")), 1, ...);
  * 
  * If this function succeeds, it returns the given SDL_AudioSpec,
  * filled with the audio data format of the wave data, and sets
@@ -178,7 +179,7 @@
 		 SDL_AudioSpec *spec, Uint8 **audio_buf, Uint32 *audio_len);
 
 /* Compatibility convenience function -- loads a WAV from a file */
-SDL_AudioSpec *SDL_LoadWAV(char* file, SDL_AudioSpec* spec,
+SDL_AudioSpec *SDL_LoadWAV(const(char)* file, SDL_AudioSpec* spec,
 		Uint8 **audio_buf, Uint32 *audio_len)
 {		
 	return SDL_LoadWAV_RW(SDL_RWFromFile(file, "rb"), 1, spec,
--- a/import/SDL_cdrom.d
+++ b/import/SDL_cdrom.d
@@ -49,7 +49,7 @@
 }
 
 /* Given a status, returns true if there's a disk in the drive */
-bit CD_INDRIVE(int status) { return status > 0; }
+bool CD_INDRIVE(int status) { return status > 0; }
 
 struct SDL_CDtrack {
 	Uint8 id;		/* Track number */
--- a/import/SDL_endian.d
+++ b/import/SDL_endian.d
@@ -47,7 +47,7 @@
 */
 
 Uint16 SDL_Swap16(Uint16 D) {
-	return((D<<8)|(D>>8));
+	return cast(Uint16)((D<<8)|(D>>8));
 }
 
 Uint32 SDL_Swap32(Uint32 D) {
--- a/import/SDL_events.d
+++ b/import/SDL_events.d
@@ -271,7 +271,7 @@
 
   The filter is protypted as:
 */
-alias int (*SDL_EventFilter)(SDL_Event *event);
+alias int function(SDL_Event *event) SDL_EventFilter;
 /*
   If the filter returns 1, then the event will be added to the internal queue.
   If it returns 0, then the event will be dropped from the queue, but the 
--- a/import/SDL_mixer.d
+++ b/import/SDL_mixer.d
@@ -9,12 +9,12 @@
 
   This library is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the GNU
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
   Library General Public License for more details.
 
   You should have received a copy of the GNU Library General Public
   License along with this library; if not, write to the Free
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA	02111-1307	USA
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
   Sam Lantinga
   slouken@libsdl.org
@@ -22,7 +22,7 @@
 
 // convert to D by shinichiro.h
 
-/* $Id: SDL_mixer.d,v 1.1.1.1 2003/11/28 17:26:28 kenta Exp $ */
+/* $Id: SDL_mixer.d,v 1.1.1.1 2006/11/19 07:54:54 kenta Exp $ */
 
 import SDL;
 
@@ -104,10 +104,10 @@
 
 /* Load a wave file or a music (.mod .s3m .it .xm) file */
 	Mix_Chunk * Mix_LoadWAV_RW(SDL_RWops *src, int freesrc);
-	Mix_Chunk * Mix_LoadWAV(char *file) {
+	Mix_Chunk * Mix_LoadWAV(const(char) *file) {
 		return Mix_LoadWAV_RW(SDL_RWFromFile(file, "rb"), 1);
 	}
-	Mix_Music * Mix_LoadMUS(char *file);
+	Mix_Music * Mix_LoadMUS(const(char) *file);
 
 /* Load a wave file of the mixer format from a memory buffer */
 	Mix_Chunk * Mix_QuickLoad_WAV(Uint8 *mem);
@@ -128,32 +128,30 @@
    This can be used to provide real-time visual display of the audio stream
    or add a custom mixer filter for the stream data.
 */
-	void Mix_SetPostMix(void (*mix_func)
-						(void *udata, Uint8 *stream, int len), void *arg);
+	void Mix_SetPostMix(void function(void *udata, Uint8 *stream, int len) mix_func, void *arg);
 
 /* Add your own music player or additional mixer function.
    If 'mix_func' is NULL, the default music player is re-enabled.
 */
-	void Mix_HookMusic(void (*mix_func)
-					   (void *udata, Uint8 *stream, int len), void *arg);
+	void Mix_HookMusic(void function(void *udata, Uint8 *stream, int len) mix_func, void *arg);
 
 /* Add your own callback when the music has finished playing.
    This callback is only called if the music finishes naturally.
 */
-	void Mix_HookMusicFinished(void (*music_finished)());
+	void Mix_HookMusicFinished(void function() music_finished);
 
 /* Get a pointer to the user data for the current music hook */
 	void * Mix_GetMusicHookData();
 
 /*
  * Add your own callback when a channel has finished playing. NULL
- *	to disable callback. The callback may be called from the mixer's audio	
- *	callback or it could be called as a result of Mix_HaltChannel(), etc.
- *	do not call SDL_LockAudio() from this callback; you will either be	
- *	inside the audio callback, or SDL_mixer will explicitly lock the audio
- *	before calling your callback.
+ *  to disable callback. The callback may be called from the mixer's audio 
+ *  callback or it could be called as a result of Mix_HaltChannel(), etc.
+ *  do not call SDL_LockAudio() from this callback; you will either be 
+ *  inside the audio callback, or SDL_mixer will explicitly lock the audio
+ *  before calling your callback.
  */
-	void Mix_ChannelFinished(void (*channel_finished)(int channel));
+	void Mix_ChannelFinished(void function(int channel) channel_finished);
 
 
 /* Special Effects API by ryan c. gordon. (icculus@linuxgames.com) */
@@ -162,106 +160,106 @@
 
 /* This is the format of a special effect callback:
  *
- *	 myeffect(int chan, void *stream, int len, void *udata);
+ *   myeffect(int chan, void *stream, int len, void *udata);
  *
  * (chan) is the channel number that your effect is affecting. (stream) is
- *	the buffer of data to work upon. (len) is the size of (stream), and
- *	(udata) is a user-defined bit of data, which you pass as the last arg of
- *	Mix_RegisterEffect(), and is passed back unmolested to your callback.
- *	Your effect changes the contents of (stream) based on whatever parameters
- *	are significant, or just leaves it be, if you prefer. You can do whatever
- *	you like to the buffer, though, and it will continue in its changed state
- *	down the mixing pipeline, through any other effect functions, then finally
- *	to be mixed with the rest of the channels and music for the final output
- *	stream.
+ *  the buffer of data to work upon. (len) is the size of (stream), and
+ *  (udata) is a user-defined bit of data, which you pass as the last arg of
+ *  Mix_RegisterEffect(), and is passed back unmolested to your callback.
+ *  Your effect changes the contents of (stream) based on whatever parameters
+ *  are significant, or just leaves it be, if you prefer. You can do whatever
+ *  you like to the buffer, though, and it will continue in its changed state
+ *  down the mixing pipeline, through any other effect functions, then finally
+ *  to be mixed with the rest of the channels and music for the final output
+ *  stream.
  *
  * DO NOT EVER call SDL_LockAudio() from your callback function!
  */
-	typedef void (*Mix_EffectFunc_t)(int chan, void *stream, int len, void *udata);
+	alias void function(int chan, void *stream, int len, void *udata) Mix_EffectFunc_t;
 
 /*
  * This is a callback that signifies that a channel has finished all its
- *	loops and has completed playback. This gets called if the buffer
- *	plays out normally, or if you call Mix_HaltChannel(), implicitly stop
- *	a channel via Mix_AllocateChannels(), or unregister a callback while
- *	it's still playing.
+ *  loops and has completed playback. This gets called if the buffer
+ *  plays out normally, or if you call Mix_HaltChannel(), implicitly stop
+ *  a channel via Mix_AllocateChannels(), or unregister a callback while
+ *  it's still playing.
  *
  * DO NOT EVER call SDL_LockAudio() from your callback function!
  */
-	typedef void (*Mix_EffectDone_t)(int chan, void *udata);
+	alias void function(int chan, void *udata) Mix_EffectDone_t;
 
 
 /* Register a special effect function. At mixing time, the channel data is
- *	copied into a buffer and passed through each registered effect function.
- *	After it passes through all the functions, it is mixed into the final
- *	output stream. The copy to buffer is performed once, then each effect
- *	function performs on the output of the previous effect. Understand that
- *	this extra copy to a buffer is not performed if there are no effects
- *	registered for a given chunk, which saves CPU cycles, and any given
- *	effect will be extra cycles, too, so it is crucial that your code run
- *	fast. Also note that the data that your function is given is in the
- *	format of the sound device, and not the format you gave to Mix_OpenAudio(),
- *	although they may in reality be the same. This is an unfortunate but
- *	necessary speed concern. Use Mix_QuerySpec() to determine if you can
- *	handle the data before you register your effect, and take appropriate
- *	actions.
+ *  copied into a buffer and passed through each registered effect function.
+ *  After it passes through all the functions, it is mixed into the final
+ *  output stream. The copy to buffer is performed once, then each effect
+ *  function performs on the output of the previous effect. Understand that
+ *  this extra copy to a buffer is not performed if there are no effects
+ *  registered for a given chunk, which saves CPU cycles, and any given
+ *  effect will be extra cycles, too, so it is crucial that your code run
+ *  fast. Also note that the data that your function is given is in the
+ *  format of the sound device, and not the format you gave to Mix_OpenAudio(),
+ *  although they may in reality be the same. This is an unfortunate but
+ *  necessary speed concern. Use Mix_QuerySpec() to determine if you can
+ *  handle the data before you register your effect, and take appropriate
+ *  actions.
  * You may also specify a callback (Mix_EffectDone_t) that is called when
- *	the channel finishes playing. This gives you a more fine-grained control
- *	than Mix_ChannelFinished(), in case you need to free effect-specific
- *	resources, etc. If you don't need this, you can specify NULL.
+ *  the channel finishes playing. This gives you a more fine-grained control
+ *  than Mix_ChannelFinished(), in case you need to free effect-specific
+ *  resources, etc. If you don't need this, you can specify NULL.
  * You may set the callbacks before or after calling Mix_PlayChannel().
  * Things like Mix_SetPanning() are just internal special effect functions,
- *	so if you are using that, you've already incurred the overhead of a copy
- *	to a separate buffer, and that these effects will be in the queue with
- *	any functions you've registered. The list of registered effects for a
- *	channel is reset when a chunk finishes playing, so you need to explicitly
- *	set them with each call to Mix_PlayChannel*().
+ *  so if you are using that, you've already incurred the overhead of a copy
+ *  to a separate buffer, and that these effects will be in the queue with
+ *  any functions you've registered. The list of registered effects for a
+ *  channel is reset when a chunk finishes playing, so you need to explicitly
+ *  set them with each call to Mix_PlayChannel*().
  * You may also register a special effect function that is to be run after
- *	final mixing occurs. The rules for these callbacks are identical to those
- *	in Mix_RegisterEffect, but they are run after all the channels and the
- *	music have been mixed into a single stream, whereas channel-specific
- *	effects run on a given channel before any other mixing occurs. These
- *	global effect callbacks are call "posteffects". Posteffects only have
- *	their Mix_EffectDone_t function called when they are unregistered (since
- *	the main output stream is never "done" in the same sense as a channel).
- *	You must unregister them manually when you've had enough. Your callback
- *	will be told that the channel being mixed is (MIX_CHANNEL_POST) if the
- *	processing is considered a posteffect.
+ *  final mixing occurs. The rules for these callbacks are identical to those
+ *  in Mix_RegisterEffect, but they are run after all the channels and the
+ *  music have been mixed into a single stream, whereas channel-specific
+ *  effects run on a given channel before any other mixing occurs. These
+ *  global effect callbacks are call "posteffects". Posteffects only have
+ *  their Mix_EffectDone_t function called when they are unregistered (since
+ *  the main output stream is never "done" in the same sense as a channel).
+ *  You must unregister them manually when you've had enough. Your callback
+ *  will be told that the channel being mixed is (MIX_CHANNEL_POST) if the
+ *  processing is considered a posteffect.
  *
  * After all these effects have finished processing, the callback registered
- *	through Mix_SetPostMix() runs, and then the stream goes to the audio
- *	device. 
+ *  through Mix_SetPostMix() runs, and then the stream goes to the audio
+ *  device. 
  *
  * DO NOT EVER call SDL_LockAudio() from your callback function!
  *
  * returns zero if error (no such channel), nonzero if added.
- *	Error messages can be retrieved from Mix_GetError().
+ *  Error messages can be retrieved from Mix_GetError().
  */
 	int Mix_RegisterEffect(int chan, Mix_EffectFunc_t f,
 						   Mix_EffectDone_t d, void *arg);
 
 
 /* You may not need to call this explicitly, unless you need to stop an
- *	effect from processing in the middle of a chunk's playback.
+ *  effect from processing in the middle of a chunk's playback.
  * Posteffects are never implicitly unregistered as they are for channels,
- *	but they may be explicitly unregistered through this function by
- *	specifying MIX_CHANNEL_POST for a channel.
+ *  but they may be explicitly unregistered through this function by
+ *  specifying MIX_CHANNEL_POST for a channel.
  * returns zero if error (no such channel or effect), nonzero if removed.
- *	Error messages can be retrieved from Mix_GetError().
+ *  Error messages can be retrieved from Mix_GetError().
  */
 	int Mix_UnregisterEffect(int channel, Mix_EffectFunc_t f);
 
 
 /* You may not need to call this explicitly, unless you need to stop all
- *	effects from processing in the middle of a chunk's playback. Note that
- *	this will also shut off some internal effect processing, since
- *	Mix_SetPanning() and others may use this API under the hood. This is
- *	called internally when a channel completes playback.
+ *  effects from processing in the middle of a chunk's playback. Note that
+ *  this will also shut off some internal effect processing, since
+ *  Mix_SetPanning() and others may use this API under the hood. This is
+ *  called internally when a channel completes playback.
  * Posteffects are never implicitly unregistered as they are for channels,
- *	but they may be explicitly unregistered through this function by
- *	specifying MIX_CHANNEL_POST for a channel.
+ *  but they may be explicitly unregistered through this function by
+ *  specifying MIX_CHANNEL_POST for a channel.
  * returns zero if error (no such channel), nonzero if all effects removed.
- *	Error messages can be retrieved from Mix_GetError().
+ *  Error messages can be retrieved from Mix_GetError().
  */
 	int Mix_UnregisterAllEffects(int channel);
 
@@ -270,131 +268,131 @@
 
 /*
  * These are the internally-defined mixing effects. They use the same API that
- *	effects defined in the application use, but are provided here as a
- *	convenience. Some effects can reduce their quality or use more memory in
- *	the name of speed; to enable this, make sure the environment variable
- *	MIX_EFFECTSMAXSPEED (see above) is defined before you call
- *	Mix_OpenAudio().
+ *  effects defined in the application use, but are provided here as a
+ *  convenience. Some effects can reduce their quality or use more memory in
+ *  the name of speed; to enable this, make sure the environment variable
+ *  MIX_EFFECTSMAXSPEED (see above) is defined before you call
+ *  Mix_OpenAudio().
  */
 
 
 /* Set the panning of a channel. The left and right channels are specified
- *	as integers between 0 and 255, quietest to loudest, respectively.
+ *  as integers between 0 and 255, quietest to loudest, respectively.
  *
  * Technically, this is just individual volume control for a sample with
- *	two (stereo) channels, so it can be used for more than just panning.
- *	If you want real panning, call it like this:
+ *  two (stereo) channels, so it can be used for more than just panning.
+ *  If you want real panning, call it like this:
  *
- *	 Mix_SetPanning(channel, left, 255 - left);
+ *   Mix_SetPanning(channel, left, 255 - left);
  *
  * ...which isn't so hard.
  *
  * Setting (channel) to MIX_CHANNEL_POST registers this as a posteffect, and
- *	the panning will be done to the final mixed stream before passing it on
- *	to the audio device.
+ *  the panning will be done to the final mixed stream before passing it on
+ *  to the audio device.
  *
  * This uses the Mix_RegisterEffect() API internally, and returns without
- *	registering the effect function if the audio device is not configured
- *	for stereo output. Setting both (left) and (right) to 255 causes this
- *	effect to be unregistered, since that is the data's normal state.
+ *  registering the effect function if the audio device is not configured
+ *  for stereo output. Setting both (left) and (right) to 255 causes this
+ *  effect to be unregistered, since that is the data's normal state.
  *
  * returns zero if error (no such channel or Mix_RegisterEffect() fails),
- *	nonzero if panning effect enabled. Note that an audio device in mono
- *	mode is a no-op, but this call will return successful in that case.
- *	Error messages can be retrieved from Mix_GetError().
+ *  nonzero if panning effect enabled. Note that an audio device in mono
+ *  mode is a no-op, but this call will return successful in that case.
+ *  Error messages can be retrieved from Mix_GetError().
  */
 	int Mix_SetPanning(int channel, Uint8 left, Uint8 right);
 
 
 /* Set the position of a channel. (angle) is an integer from 0 to 360, that
- *	specifies the location of the sound in relation to the listener. (angle)
- *	will be reduced as neccesary (540 becomes 180 degrees, -100 becomes 260).
- *	Angle 0 is due north, and rotates clockwise as the value increases.
- *	For efficiency, the precision of this effect may be limited (angles 1
- *	through 7 might all produce the same effect, 8 through 15 are equal, etc).
- *	(distance) is an integer between 0 and 255 that specifies the space
- *	between the sound and the listener. The larger the number, the further
- *	away the sound is. Using 255 does not guarantee that the channel will be
- *	culled from the mixing process or be completely silent. For efficiency,
- *	the precision of this effect may be limited (distance 0 through 5 might
- *	all produce the same effect, 6 through 10 are equal, etc). Setting (angle)
- *	and (distance) to 0 unregisters this effect, since the data would be
- *	unchanged.
+ *  specifies the location of the sound in relation to the listener. (angle)
+ *  will be reduced as neccesary (540 becomes 180 degrees, -100 becomes 260).
+ *  Angle 0 is due north, and rotates clockwise as the value increases.
+ *  For efficiency, the precision of this effect may be limited (angles 1
+ *  through 7 might all produce the same effect, 8 through 15 are equal, etc).
+ *  (distance) is an integer between 0 and 255 that specifies the space
+ *  between the sound and the listener. The larger the number, the further
+ *  away the sound is. Using 255 does not guarantee that the channel will be
+ *  culled from the mixing process or be completely silent. For efficiency,
+ *  the precision of this effect may be limited (distance 0 through 5 might
+ *  all produce the same effect, 6 through 10 are equal, etc). Setting (angle)
+ *  and (distance) to 0 unregisters this effect, since the data would be
+ *  unchanged.
  *
  * If you need more precise positional audio, consider using OpenAL for
- *	spatialized effects instead of SDL_mixer. This is only meant to be a
- *	basic effect for simple "3D" games.
+ *  spatialized effects instead of SDL_mixer. This is only meant to be a
+ *  basic effect for simple "3D" games.
  *
  * If the audio device is configured for mono output, then you won't get
- *	any effectiveness from the angle; however, distance attenuation on the
- *	channel will still occur. While this effect will function with stereo
- *	voices, it makes more sense to use voices with only one channel of sound,
- *	so when they are mixed through this effect, the positioning will sound
- *	correct. You can convert them to mono through SDL before giving them to
- *	the mixer in the first place if you like.
+ *  any effectiveness from the angle; however, distance attenuation on the
+ *  channel will still occur. While this effect will function with stereo
+ *  voices, it makes more sense to use voices with only one channel of sound,
+ *  so when they are mixed through this effect, the positioning will sound
+ *  correct. You can convert them to mono through SDL before giving them to
+ *  the mixer in the first place if you like.
  *
  * Setting (channel) to MIX_CHANNEL_POST registers this as a posteffect, and
- *	the positioning will be done to the final mixed stream before passing it
- *	on to the audio device.
+ *  the positioning will be done to the final mixed stream before passing it
+ *  on to the audio device.
  *
  * This is a convenience wrapper over Mix_SetDistance() and Mix_SetPanning().
  *
  * returns zero if error (no such channel or Mix_RegisterEffect() fails),
- *	nonzero if position effect is enabled.
- *	Error messages can be retrieved from Mix_GetError().
+ *  nonzero if position effect is enabled.
+ *  Error messages can be retrieved from Mix_GetError().
  */
 	int Mix_SetPosition(int channel, Sint16 angle, Uint8 distance);
 
 
 /* Set the "distance" of a channel. (distance) is an integer from 0 to 255
- *	that specifies the location of the sound in relation to the listener.
- *	Distance 0 is overlapping the listener, and 255 is as far away as possible
- *	A distance of 255 does not guarantee silence; in such a case, you might
- *	want to try changing the chunk's volume, or just cull the sample from the
- *	mixing process with Mix_HaltChannel().
+ *  that specifies the location of the sound in relation to the listener.
+ *  Distance 0 is overlapping the listener, and 255 is as far away as possible
+ *  A distance of 255 does not guarantee silence; in such a case, you might
+ *  want to try changing the chunk's volume, or just cull the sample from the
+ *  mixing process with Mix_HaltChannel().
  * For efficiency, the precision of this effect may be limited (distances 1
- *	through 7 might all produce the same effect, 8 through 15 are equal, etc).
- *	(distance) is an integer between 0 and 255 that specifies the space
- *	between the sound and the listener. The larger the number, the further
- *	away the sound is.
+ *  through 7 might all produce the same effect, 8 through 15 are equal, etc).
+ *  (distance) is an integer between 0 and 255 that specifies the space
+ *  between the sound and the listener. The larger the number, the further
+ *  away the sound is.
  * Setting (distance) to 0 unregisters this effect, since the data would be
- *	unchanged.
+ *  unchanged.
  * If you need more precise positional audio, consider using OpenAL for
- *	spatialized effects instead of SDL_mixer. This is only meant to be a
- *	basic effect for simple "3D" games.
+ *  spatialized effects instead of SDL_mixer. This is only meant to be a
+ *  basic effect for simple "3D" games.
  *
  * Setting (channel) to MIX_CHANNEL_POST registers this as a posteffect, and
- *	the distance attenuation will be done to the final mixed stream before
- *	passing it on to the audio device.
+ *  the distance attenuation will be done to the final mixed stream before
+ *  passing it on to the audio device.
  *
  * This uses the Mix_RegisterEffect() API internally.
  *
  * returns zero if error (no such channel or Mix_RegisterEffect() fails),
- *	nonzero if position effect is enabled.
- *	Error messages can be retrieved from Mix_GetError().
+ *  nonzero if position effect is enabled.
+ *  Error messages can be retrieved from Mix_GetError().
  */
 	int Mix_SetDistance(int channel, Uint8 distance);
 
 
 /* Causes a channel to reverse its stereo. This is handy if the user has his
- *	speakers hooked up backwards, or you would like to have a minor bit of
- *	psychedelia in your sound code.  :)  Calling this function with (flip)
- *	set to non-zero reverses the chunks's usual channels. If (flip) is zero,
- *	the effect is unregistered.
+ *  speakers hooked up backwards, or you would like to have a minor bit of
+ *  psychedelia in your sound code.  :)  Calling this function with (flip)
+ *  set to non-zero reverses the chunks's usual channels. If (flip) is zero,
+ *  the effect is unregistered.
  *
  * This uses the Mix_RegisterEffect() API internally, and thus is probably
- *	more CPU intensive than having the user just plug in his speakers
- *	correctly. Mix_SetReverseStereo() returns without registering the effect
- *	function if the audio device is not configured for stereo output.
+ *  more CPU intensive than having the user just plug in his speakers
+ *  correctly. Mix_SetReverseStereo() returns without registering the effect
+ *  function if the audio device is not configured for stereo output.
  *
  * If you specify MIX_CHANNEL_POST for (channel), then this the effect is used
- *	on the final mixed stream before sending it on to the audio device (a
- *	posteffect).
+ *  on the final mixed stream before sending it on to the audio device (a
+ *  posteffect).
  *
  * returns zero if error (no such channel or Mix_RegisterEffect() fails),
- *	nonzero if reversing effect is enabled. Note that an audio device in mono
- *	mode is a no-op, but this call will return successful in that case.
- *	Error messages can be retrieved from Mix_GetError().
+ *  nonzero if reversing effect is enabled. Note that an audio device in mono
+ *  mode is a no-op, but this call will return successful in that case.
+ *  Error messages can be retrieved from Mix_GetError().
  */
 	int Mix_SetReverseStereo(int channel, int flip);
 
@@ -510,7 +508,7 @@
 	int Mix_PlayingMusic();
 
 /* Stop music and set external music playback command */
-	int Mix_SetMusicCMD(char *command);
+	int Mix_SetMusicCMD(const(char) *command);
 
 /* Synchro value is set by MikMod from modules while playing */
 	int Mix_SetSynchroValue(int value);
--- a/import/SDL_quit.d
+++ b/import/SDL_quit.d
@@ -40,8 +40,8 @@
 */
 
 /* There are no functions directly affecting the quit event */
-bit SDL_QuitRequested()
+bool SDL_QuitRequested()
 {
 	SDL_PumpEvents();
-	return cast(bit)SDL_PeepEvents(null, 0, SDL_PEEKEVENT, SDL_QUITMASK);
+	return 0 != SDL_PeepEvents(null, 0, SDL_PEEKEVENT, SDL_QUITMASK);
 }
--- a/import/SDL_rwops.d
+++ b/import/SDL_rwops.d
@@ -28,11 +28,6 @@
 
 extern(C):
 
-typedef int (*_seek_func_t)(SDL_RWops *context, int offset, int whence);
-typedef int (*_read_func_t)(SDL_RWops *context, void *ptr, int size, int maxnum);
-typedef int (*_write_func_t)(SDL_RWops *context, void *ptr, int size, int num);
-typedef int (*_close_func_t)(SDL_RWops *context);
-
 /* This is the read/write operation structure -- very basic */
 
 struct SDL_RWops {
@@ -40,26 +35,22 @@
 		SEEK_SET, SEEK_CUR, SEEK_END
 	   Returns the final offset in the data source.
 	 */
-	_seek_func_t seek;
-//	int (*seek)(SDL_RWops *context, int offset, int whence);
+	int function(SDL_RWops *context, int offset, int whence) seek;
 
 	/* Read up to 'num' objects each of size 'objsize' from the data
 	   source to the area pointed at by 'ptr'.
 	   Returns the number of objects read, or -1 if the read failed.
 	 */
-	_read_func_t read;
-//	int (*read)(SDL_RWops *context, void *ptr, int size, int maxnum);
+	int function(SDL_RWops *context, void *ptr, int size, int maxnum) read;
 
 	/* Write exactly 'num' objects each of size 'objsize' from the area
 	   pointed at by 'ptr' to data source.
 	   Returns 'num', or -1 if the write failed.
 	 */
-	_write_func_t write;
-//	int (*write)(SDL_RWops *context, void *ptr, int size, int num);
+	int function(SDL_RWops *context, void *ptr, int size, int num) write;
 
 	/* Close and free an allocated SDL_FSops structure */
-	_close_func_t close;
-//	int (*close)(SDL_RWops *context);
+	int function(SDL_RWops *context) close;
 
 	Uint32 type;
 	union {
@@ -81,7 +72,7 @@
 
 /* Functions to create SDL_RWops structures from various data sources */
 
-SDL_RWops * SDL_RWFromFile(char *file, char *mode);
+SDL_RWops * SDL_RWFromFile(const(char)* file, const(char)* mode);
 
 SDL_RWops * SDL_RWFromFP(void *fp, int autoclose);
 
@@ -93,40 +84,25 @@
 /* Macros to easily read and write from an SDL_RWops structure */
 int SDL_RWseek(SDL_RWops *ctx, int offset, int whence)
 {
-	_seek_func_t seek;
-//	int (*seek)(SDL_RWops *context, int offset, int whence);
-	seek = ctx.seek;
-	return (*seek)(ctx, offset, whence);
+	return ctx.seek(ctx, offset, whence);
 }
 
 int SDL_RWtell(SDL_RWops *ctx)
 {
-	_seek_func_t seek;
-//	int (*seek)(SDL_RWops *context, int offset, int whence);
-	seek = ctx.seek;
-	return (*seek)(ctx, 0, 1);
+	return ctx.seek(ctx, 0, 1);
 }
 
 int SDL_RWread(SDL_RWops *ctx, void* ptr, int size, int n)
 {
-	_read_func_t read;
-//	int (*read)(SDL_RWops *context, void *ptr, int size, int maxnum);
-	read = ctx.read;
-	return (*read)(ctx, ptr, size, n);
+	return ctx.read(ctx, ptr, size, n);
 }
 
 int SDL_RWwrite(SDL_RWops *ctx, void* ptr, int size, int n)
 {
-	_write_func_t write;
-//	int (*write)(SDL_RWops *context, void *ptr, int size, int num);
-	write = ctx.write;
-	return (*write)(ctx, ptr, size, n);
+	return ctx.write(ctx, ptr, size, n);
 }
 
 int SDL_RWclose(SDL_RWops *ctx)
 {
-	_close_func_t close;
-//	int (*close)(SDL_RWops *context);
-	close = ctx.close;
-	return (*close)(ctx);
+	return ctx.close(ctx);
 }
--- a/import/SDL_thread.d
+++ b/import/SDL_thread.d
@@ -34,7 +34,7 @@
 struct SDL_Thread { }
 
 /* Create a thread */
-SDL_Thread * SDL_CreateThread(int (*fn)(void *), void *data);
+SDL_Thread * SDL_CreateThread(int function(void *) fn, void *data);
 
 /* Get the 32-bit thread identifier for the current thread */
 Uint32 SDL_ThreadID();
--- a/import/SDL_timer.d
+++ b/import/SDL_timer.d
@@ -39,7 +39,7 @@
 void SDL_Delay(Uint32 ms);
 
 /* Function prototype for the timer callback function */
-alias Uint32 (*SDL_TimerCallback)(Uint32 interval);
+alias Uint32 function(Uint32 interval) SDL_TimerCallback;
 
 /* Set a callback to run after the specified number of milliseconds has
  * elapsed. The callback function is passed the current timer interval
@@ -79,7 +79,7 @@
  * passed in, the periodic alarm continues, otherwise a new alarm is
  * scheduled.  If the callback returns 0, the periodic alarm is cancelled.
  */
-alias Uint32 (*SDL_NewTimerCallback)(Uint32 interval, void *param);
+alias Uint32 function(Uint32 interval, void *param) SDL_NewTimerCallback;
 
 /* Definition of the timer ID type */
 alias void *SDL_TimerID;
--- a/import/SDL_types.d
+++ b/import/SDL_types.d
@@ -33,7 +33,7 @@
 alias ushort	Uint16;
 alias short	Sint16;
 alias uint	Uint32;
-alias int		Sint32;
+alias int	Sint32;
 
 alias ulong	Uint64;
 alias long	Sint64;
--- a/import/SDL_version_.d
+++ b/import/SDL_version_.d
@@ -63,7 +63,7 @@
 									SDL_PATCHLEVEL;
 
 /* This macro will evaluate to true if compiled with SDL at least X.Y.Z */
-bit SDL_VERSION_ATLEAST(Uint8 X, Uint8 Y, Uint8 Z)
+bool SDL_VERSION_ATLEAST(Uint8 X, Uint8 Y, Uint8 Z)
 {
 	return (SDL_COMPILEDVERSION >= SDL_VERSIONNUM(X, Y, Z));
 }
--- a/import/SDL_video.d
+++ b/import/SDL_video.d
@@ -74,9 +74,9 @@
 	Uint8  alpha;
 }
 
-/* typedef for private surface blitting functions */
-typedef int (*SDL_blit)(SDL_Surface *src, SDL_Rect *srcrect,
-			SDL_Surface *dst, SDL_Rect *dstrect);
+/* alias for private surface blitting functions */
+alias int function(SDL_Surface *src, SDL_Rect *srcrect,
+			SDL_Surface *dst, SDL_Rect *dstrect) SDL_blit;
 
 /* This structure should be treated as read-only, except for 'pixels',
    which, if not NULL, contains the raw pixel data for the surface.
@@ -132,7 +132,7 @@
 const uint SDL_PREALLOC	= 0x01000000;	/* Surface uses preallocated memory */
 
 /* Evaluates to true if the surface needs to be locked before access */
-bit SDL_MUSTLOCK(SDL_Surface *surface)
+bool SDL_MUSTLOCK(SDL_Surface *surface)
 {
 	return surface.offset || ((surface.flags &
 		(SDL_HWSURFACE | SDL_ASYNCBLIT | SDL_RLEACCEL)) != 0);
@@ -186,7 +186,7 @@
 	/* Special flags */
 	union
 	{
-		bit hw_overlay;
+		bool hw_overlay;
 		Uint32 _dummy;
 	}
 //		Uint32 hw_overlay :1;	/* Flag: This overlay hardware accelerated? */
@@ -540,7 +540,7 @@
 SDL_Surface * SDL_LoadBMP_RW(SDL_RWops *src, int freesrc);
 
 /* Convenience macro -- load a surface from a file */
-SDL_Surface * SDL_LoadBMP(char* file)
+SDL_Surface * SDL_LoadBMP(const(char)* file)
 {
 	return SDL_LoadBMP_RW(SDL_RWFromFile(file, "rb"), 1);
 }
@@ -554,7 +554,7 @@
 		(SDL_Surface *surface, SDL_RWops *dst, int freedst);
 
 /* Convenience macro -- save a surface to a file */
-int SDL_SaveBMP(SDL_Surface *surface, char* file)
+int SDL_SaveBMP(SDL_Surface *surface, const(char)* file)
 {
 	return SDL_SaveBMP_RW(surface, SDL_RWFromFile(file, "wb"), 1);
 }
@@ -837,7 +837,7 @@
 /*
  * Sets/Gets the title and icon text of the display window
  */
-void SDL_WM_SetCaption(char *title, char *icon);
+void SDL_WM_SetCaption(const(char) *title, char *icon);
 void SDL_WM_GetCaption(char **title, char **icon);
 
 /*
--- a/import/bulletml.d
+++ b/import/bulletml.d
@@ -1,7 +1,7 @@
 extern (C) {
 alias int BulletMLParserTinyXML;
-int* BulletMLParserTinyXML_new(char*);
-void BulletMLParserTinyXML_parse(int* );
+int* BulletMLParserTinyXML_new(const(char)*);
+void BulletMLParserTinyXML_parse(int*);
 void BulletMLParserTinyXML_delete(int*);
 alias int BulletMLParser;
 alias int BulletMLState;
@@ -10,22 +10,22 @@
 int* BulletMLRunner_new_parser(BulletMLParser*);
 int* BulletMLRunner_new_state(BulletMLState*);
 void BulletMLRunner_delete(int*);
-void BulletMLRunner_run(int* );
-bool BulletMLRunner_isEnd(int* );
-void BulletMLRunner_set_getBulletDirection(int*, double (*fp) (int* )); 
-void BulletMLRunner_set_getAimDirection(int*, double (*fp) (int* )); 
-void BulletMLRunner_set_getBulletSpeed(int*, double (*fp) (int* )); 
-void BulletMLRunner_set_getDefaultSpeed(int*, double (*fp) (int* )); 
-void BulletMLRunner_set_getRank(int*, double (*fp) (int* )); 
-void BulletMLRunner_set_createSimpleBullet(int*, void (*fp) (int* , double, double)); 
-void BulletMLRunner_set_createBullet(int*, void (*fp) (int* , BulletMLState*, double, double)); 
-void BulletMLRunner_set_getTurn(int*, int (*fp) (int* )); 
-void BulletMLRunner_set_doVanish(int*, void (*fp) (int* )); 
-void BulletMLRunner_set_doChangeDirection(int*, void (*fp) (int* , double)); 
-void BulletMLRunner_set_doChangeSpeed(int*, void (*fp) (int* , double)); 
-void BulletMLRunner_set_doAccelX(int*, void (*fp) (int* , double)); 
-void BulletMLRunner_set_doAccelY(int*, void (*fp) (int* , double)); 
-void BulletMLRunner_set_getBulletSpeedX(int*, double (*fp) (int* )); 
-void BulletMLRunner_set_getBulletSpeedY(int*, double (*fp) (int* )); 
-void BulletMLRunner_set_getRand(int*, double (*fp) (int* )); 
+void BulletMLRunner_run(int*);
+bool BulletMLRunner_isEnd(int*);
+void BulletMLRunner_set_getBulletDirection(int*, double function(int*) fp); 
+void BulletMLRunner_set_getAimDirection(int*, double function(int*) fp); 
+void BulletMLRunner_set_getBulletSpeed(int*, double function(int*) fp); 
+void BulletMLRunner_set_getDefaultSpeed(int*, double function(int*) fp); 
+void BulletMLRunner_set_getRank(int*, double function(int*) fp); 
+void BulletMLRunner_set_createSimpleBullet(int*, void function(int*, double, double) fp); 
+void BulletMLRunner_set_createBullet(int*, void function(int*, BulletMLState*, double, double) fp); 
+void BulletMLRunner_set_getTurn(int*, int function(int*) fp); 
+void BulletMLRunner_set_doVanish(int*, void function(int*) fp); 
+void BulletMLRunner_set_doChangeDirection(int*, void function(int*, double) fp); 
+void BulletMLRunner_set_doChangeSpeed(int*, void function(int*, double) fp); 
+void BulletMLRunner_set_doAccelX(int*, void function(int*, double) fp); 
+void BulletMLRunner_set_doAccelY(int*, void function(int*, double) fp); 
+void BulletMLRunner_set_getBulletSpeedX(int*, double function(int*) fp); 
+void BulletMLRunner_set_getBulletSpeedY(int*, double function(int*) fp); 
+void BulletMLRunner_set_getRand(int*, double function(int*) fp); 
 }
--- a/import/opengl.d
+++ b/import/opengl.d
@@ -1,10 +1,4 @@
-version (Win32) {
-	private import std.c.windows.windows;
-	extern(Windows):
-}
-else {
-	extern(C):
-}
+extern(System):
 
 alias uint GLenum;
 alias ubyte GLboolean;
@@ -165,6 +159,7 @@
 const uint GL_3_BYTES                    = 0x1408;
 const uint GL_4_BYTES                    = 0x1409;
 const uint GL_DOUBLE                     = 0x140A;
+const uint GL_UNSIGNED_INT_8_8_8_8_REV   = 0x8367;
 
 /* DepthFunction */
 /*      GL_NEVER */
@@ -1116,7 +1111,7 @@
 /*************************************************************/
 
 void /*APIENTRY*/glAccum (GLenum op, GLfloat value);
-void /*APIENTRY*/glAlphaFunc (GLenum func, GLclampf ref);
+void /*APIENTRY*/glAlphaFunc (GLenum func, GLclampf ref_);
 GLboolean /*APIENTRY*/glAreTexturesResident (GLsizei n, GLuint *textures, GLboolean *residences);
 void /*APIENTRY*/glArrayElement (GLint i);
 void /*APIENTRY*/glBegin (GLenum mode);
@@ -1369,7 +1364,7 @@
 void /*APIENTRY*/glScissor (GLint x, GLint y, GLsizei width, GLsizei height);
 void /*APIENTRY*/glSelectBuffer (GLsizei size, GLuint *buffer);
 void /*APIENTRY*/glShadeModel (GLenum mode);
-void /*APIENTRY*/glStencilFunc (GLenum func, GLint ref, GLuint mask);
+void /*APIENTRY*/glStencilFunc (GLenum func, GLint ref_, GLuint mask);
 void /*APIENTRY*/glStencilMask (GLuint mask);
 void /*APIENTRY*/glStencilOp (GLenum fail, GLenum zfail, GLenum zpass);
 void /*APIENTRY*/glTexCoord1d (GLdouble s);
@@ -1454,35 +1449,30 @@
 
 
 /* EXT_vertex_array */
-typedef void (* PFNGLARRAYELEMENTEXTPROC) (GLint i);
-typedef void (* PFNGLDRAWARRAYSEXTPROC) (GLenum mode, GLint first, GLsizei count);
-typedef void (* PFNGLVERTEXPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, GLvoid *pointer);
-typedef void (* PFNGLNORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, GLvoid *pointer);
-typedef void (* PFNGLCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, GLvoid *pointer);
-typedef void (* PFNGLINDEXPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, GLvoid *pointer);
-typedef void (* PFNGLTEXCOORDPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, GLvoid *pointer);
-typedef void (* PFNGLEDGEFLAGPOINTEREXTPROC) (GLsizei stride, GLsizei count, GLboolean *pointer);
-typedef void (* PFNGLGETPOINTERVEXTPROC) (GLenum pname, GLvoid* *params);
-typedef void (* PFNGLARRAYELEMENTARRAYEXTPROC)(GLenum mode, GLsizei count, GLvoid* pi);
+alias void function(GLint i) PFNGLARRAYELEMENTEXTPROC;
+alias void function(GLenum mode, GLint first, GLsizei count) PFNGLDRAWARRAYSEXTPROC;
+alias void function(GLint size, GLenum type, GLsizei stride, GLsizei count, GLvoid *pointer) PFNGLVERTEXPOINTEREXTPROC;
+alias void function(GLenum type, GLsizei stride, GLsizei count, GLvoid *pointer) PFNGLNORMALPOINTEREXTPROC;
+alias void function(GLint size, GLenum type, GLsizei stride, GLsizei count, GLvoid *pointer) PFNGLCOLORPOINTEREXTPROC;
+alias void function(GLenum type, GLsizei stride, GLsizei count, GLvoid *pointer) PFNGLINDEXPOINTEREXTPROC;
+alias void function(GLint size, GLenum type, GLsizei stride, GLsizei count, GLvoid *pointer) PFNGLTEXCOORDPOINTEREXTPROC;
+alias void function(GLsizei stride, GLsizei count, GLboolean *pointer) PFNGLEDGEFLAGPOINTEREXTPROC;
+alias void function(GLenum pname, GLvoid* *params) PFNGLGETPOINTERVEXTPROC;
+alias void function(GLenum mode, GLsizei count, GLvoid* pi) PFNGLARRAYELEMENTARRAYEXTPROC;
 
 /* WIN_draw_range_elements */
-typedef void (* PFNGLDRAWRANGEELEMENTSWINPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, GLvoid *indices);
+alias void function(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, GLvoid *indices) PFNGLDRAWRANGEELEMENTSWINPROC;
 
 /* WIN_swap_hint */
-typedef void (* PFNGLADDSWAPHINTRECTWINPROC)  (GLint x, GLint y, GLsizei width, GLsizei height);
+alias void function(GLint x, GLint y, GLsizei width, GLsizei height) PFNGLADDSWAPHINTRECTWINPROC;
 
 /* EXT_paletted_texture */
-typedef void (* PFNGLCOLORTABLEEXTPROC)
-    (GLenum target, GLenum internalFormat, GLsizei width, GLenum format,
-     GLenum type, GLvoid *data);
-typedef void (* PFNGLCOLORSUBTABLEEXTPROC)
-    (GLenum target, GLsizei start, GLsizei count, GLenum format,
-     GLenum type, GLvoid *data);
-typedef void (* PFNGLGETCOLORTABLEEXTPROC)
-    (GLenum target, GLenum format, GLenum type, GLvoid *data);
-typedef void (* PFNGLGETCOLORTABLEPARAMETERIVEXTPROC)
-    (GLenum target, GLenum pname, GLint *params);
-typedef void (* PFNGLGETCOLORTABLEPARAMETERFVEXTPROC)
-    (GLenum target, GLenum pname, GLfloat *params);
+alias void function(GLenum target, GLenum internalFormat, GLsizei width, GLenum format,
+     GLenum type, GLvoid *data) PFNGLCOLORTABLEEXTPROC;
+alias void function(GLenum target, GLsizei start, GLsizei count, GLenum format,
+     GLenum type, GLvoid *data) PFNGLCOLORSUBTABLEEXTPROC;
+alias void function(GLenum target, GLenum format, GLenum type, GLvoid *data) PFNGLGETCOLORTABLEEXTPROC;
+alias void function(GLenum target, GLenum pname, GLint *params) PFNGLGETCOLORTABLEPARAMETERIVEXTPROC;
+alias void function(GLenum target, GLenum pname, GLfloat *params) PFNGLGETCOLORTABLEPARAMETERFVEXTPROC;
 
 //import openglu;
--- a/import/openglu.d
+++ b/import/openglu.d
@@ -1,11 +1,6 @@
 import opengl;
 
-version (Win32) {
-	extern(Windows):
-}
-else {
-	extern(C):
-}
+extern(System):
 
 GLubyte* gluErrorString (
     GLenum   errCode);
@@ -33,7 +28,7 @@
     GLdouble y, 
     GLdouble width, 
     GLdouble height, 
-    GLint[4]    viewport);
+    ref GLint[4] viewport);
 
 void gluLookAt (
     GLdouble eyex, 
@@ -50,9 +45,9 @@
     GLdouble        objx, 
     GLdouble        objy, 
     GLdouble        objz,  
-    GLdouble[16]    modelMatrix, 
-    GLdouble[16]    projMatrix, 
-    GLint[4]        viewport, 
+    ref GLdouble[16] modelMatrix, 
+    ref GLdouble[16] projMatrix, 
+    ref GLint[4]    viewport, 
     GLdouble        *winx, 
     GLdouble        *winy, 
     GLdouble        *winz);
@@ -61,8 +56,8 @@
     GLdouble       winx, 
     GLdouble       winy, 
     GLdouble       winz, 
-    GLdouble[16]   modelMatrix, 
-    GLdouble[16]   projMatrix, 
+    ref GLdouble[16] modelMatrix, 
+    ref GLdouble[16] projMatrix, 
     GLint[4]       viewport, 
     GLdouble       *objx, 
     GLdouble       *objy, 
@@ -162,7 +157,7 @@
 void gluQuadricCallback (
     GLUquadric          *qobj, 
     GLenum              which, 
-    void                (* fn)());
+    void                function() fn);
 
 GLUtesselator*  gluNewTess(          
     );
@@ -179,7 +174,7 @@
 
 void  gluTessVertex(       
     GLUtesselator       *tess,
-    GLdouble[3]         coords, 
+    ref GLdouble[3]     coords, 
     void                *data );
 
 void  gluTessEndContour(   
@@ -202,7 +197,7 @@
 void  gluTessCallback(     
     GLUtesselator       *tess,
     GLenum              which, 
-    void                ( *fn)());
+    void                function() fn);
 
 void  gluGetTessProperty(  
     GLUtesselator       *tess,
@@ -265,9 +260,9 @@
 void 
 gluLoadSamplingMatrices (
     GLUnurbs            *nobj, 
-    GLfloat[16]     modelMatrix, 
-    GLfloat[16]     projMatrix, 
-    GLint[4]        viewport );
+    ref GLfloat[16]     modelMatrix, 
+    ref GLfloat[16]     projMatrix, 
+    ref GLint[4]        viewport );
 
 void 
 gluNurbsProperty (
@@ -285,37 +280,37 @@
 gluNurbsCallback (
     GLUnurbs            *nobj, 
     GLenum              which, 
-    void                (* fn)() );
+    void                function() fn );
 
 
 /****            function prototypes    ****/
 
 /* gluQuadricCallback */
-typedef void (* GLUquadricErrorProc) (GLenum);
+alias void function(GLenum) GLUquadricErrorProc;
 
 /* gluTessCallback */
-typedef void (* GLUtessBeginProc)        (GLenum);
-typedef void (* GLUtessEdgeFlagProc)     (GLboolean);
-typedef void (* GLUtessVertexProc)       (void *);
-typedef void (* GLUtessEndProc)          ();
-typedef void (* GLUtessErrorProc)        (GLenum);
-typedef void (* GLUtessCombineProc)      (GLdouble[3],
-                                                  void*[4], 
-                                                  GLfloat[4],
-                                                  void** );
-typedef void (* GLUtessBeginDataProc)    (GLenum, void *);
-typedef void (* GLUtessEdgeFlagDataProc) (GLboolean, void *);
-typedef void (* GLUtessVertexDataProc)   (void *, void *);
-typedef void (* GLUtessEndDataProc)      (void *);
-typedef void (* GLUtessErrorDataProc)    (GLenum, void *);
-typedef void (* GLUtessCombineDataProc)  (GLdouble[3],
-                                                  void*[4], 
-                                                  GLfloat[4],
-                                                  void**,
-                                                  void* );
+alias void function(GLenum) GLUtessBeginProc;
+alias void function(GLboolean) GLUtessEdgeFlagProc;
+alias void function(void *) GLUtessVertexProc;
+alias void function() GLUtessEndProc;
+alias void function(GLenum) GLUtessErrorProc;
+alias void function(ref GLdouble[3],
+                    ref void*[4], 
+                    ref GLfloat[4],
+                    void**) GLUtessCombineProc;
+alias void function(GLenum, void *) GLUtessBeginDataProc;
+alias void function(GLboolean, void *) GLUtessEdgeFlagDataProc;
+alias void function(void *, void *) GLUtessVertexDataProc;
+alias void function(void *) GLUtessEndDataProc;
+alias void function(GLenum, void *) GLUtessErrorDataProc;
+alias void function(ref GLdouble[3],
+                    ref void*[4], 
+                    ref GLfloat[4],
+                    void**,
+                    void*) GLUtessCombineDataProc;
 
 /* gluNurbsCallback */
-typedef void (* GLUnurbsErrorProc)   (GLenum);
+alias void function(GLenum) GLUnurbsErrorProc;
 
 
 /****           Generic constants               ****/
--- a/import/MPEGfilter.d
+++ b/import/MPEGfilter.d
@@ -36,8 +36,8 @@
 	}
 
 /* Callback functions for the filter */
-	typedef void (* SMPEG_FilterCallback)( SDL_Overlay * dest, SDL_Overlay * source, SDL_Rect * region, SMPEG_FilterInfo * filter_info, void * data );
-	typedef void (* SMPEG_FilterDestroy)( SMPEG_Filter * filter );
+	alias void function( SDL_Overlay * dest, SDL_Overlay * source, SDL_Rect * region, SMPEG_FilterInfo * filter_info, void * data ) SMPEG_FilterCallback;
+	alias void function( SMPEG_Filter * filter ) SMPEG_FilterDestroy;
 
 /* The filter definition itself */
 	struct SMPEG_Filter {
--- a/import/smpeg.d
+++ b/import/smpeg.d
@@ -75,8 +75,8 @@
 
 
 /* Matches the declaration of SDL_UpdateRect() */
-	typedef void(*SMPEG_DisplayCallback)(SDL_Surface* dst, int x, int y,
-										 uint w, uint h);
+	alias void function(SDL_Surface* dst, int x, int y,
+										 uint w, uint h) SMPEG_DisplayCallback;
 
 /* Create a new SMPEG object from an MPEG file.
    On return, if 'info' is not NULL, it will be filled with information 
@@ -135,7 +135,7 @@
 	void SMPEG_scaleXY( SMPEG* mpeg, int width, int height );
 	void SMPEG_scale( SMPEG* mpeg, int scale );
 /* */
-	void SMPEG_double(SMPEG* mpeg, bit on) {
+	void SMPEG_double(SMPEG* mpeg, bool on) {
 		SMPEG_scale(mpeg, (on) ? 2 : 1);
 	}