Skip to content

Commit 353b219

Browse files
growlercabgrowlercab
committed
[Issue 34] C-style array warnings with DMD 2.067-b2.
This commit should fix the compiler warnings about C-style array declarations that have come in with DMD 2.067. I've tested on DMD 2.067-b2.
1 parent d09fd7c commit 353b219

File tree

6 files changed

+22
-22
lines changed

6 files changed

+22
-22
lines changed

‎deimos/X11/Xlib.d

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ struct XKeyboardState{
373373
uint bell_pitch, bell_duration;
374374
c_ulong led_mask;
375375
int global_auto_repeat;
376-
char auto_repeats[32];
376+
char[32] auto_repeats;
377377
}
378378

379379
/* Data structure for XGetMotionEvents. */
@@ -552,7 +552,7 @@ struct XKeymapEvent{
552552
Bool send_event; /* true if this came from a SendEvent request */
553553
Display* display; /* Display the event was read from */
554554
Window window;
555-
char key_vector[32];
555+
char[32] key_vector;
556556
}
557557

558558
struct XExposeEvent{
@@ -795,9 +795,9 @@ struct XClientMessageEvent{
795795
Atom message_type;
796796
int format;
797797
union _data {
798-
char b[20];
799-
short s[10];
800-
c_long l[5];
798+
char[20] b;
799+
short[10] s;
800+
c_long[5] l;
801801
}
802802
_data data;
803803
}
@@ -896,7 +896,7 @@ struct XGenericEventCookie{
896896
XKeymapEvent xkeymap;
897897
XGenericEvent xgeneric;
898898
XGenericEventCookie xcookie;
899-
c_long pad[24];
899+
c_long[24] pad;
900900
};
901901

902902
int XAllocID(Display* dpy) {return cast(int) dpy.resource_alloc(dpy);}

‎deimos/X11/Xlibint.d

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,12 @@ struct _XDisplay{
112112
Display* /* dpy */,
113113
XEvent* /* re */,
114114
xEvent* /* event */
115-
) event_vec[128];
115+
)[128] event_vec;
116116
extern (C) nothrow Status function( /* vector for event to wire */
117117
Display* /* dpy */,
118118
XEvent* /* re */,
119119
xEvent* /* event */
120-
) wire_vec[128];
120+
)[128] wire_vec;
121121
KeySym lock_meaning; /* for XLookupString */
122122
_XLockInfo* lock; /* multi-thread state, display lock */
123123
_XInternalAsync* async_handlers; /* for internal async */
@@ -174,13 +174,13 @@ struct _XDisplay{
174174
Display* /* dpy */,
175175
XGenericEventCookie* /* Xlib event */,
176176
xEvent* /* wire event */
177-
) generic_event_vec[128];
177+
)[128] generic_event_vec;
178178
/* vector for event copy, index is (extension - 128) */
179179
extern (C) nothrow Bool function(
180180
Display* /* dpy */,
181181
XGenericEventCookie* /* in */,
182182
XGenericEventCookie* /* out */
183-
) generic_event_copy_vec[128];
183+
)[128] generic_event_copy_vec;
184184
void* cookiejar; /* cookie events returned but not claimed */
185185
};
186186
alias _XDisplay Display;

‎deimos/X11/Xproto.d

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ struct xQueryKeymapReply{
534534
BYTE pad1;
535535
CARD16 sequenceNumber;
536536
CARD32 length; /* 2, NOT 0; this is an extra-large reply */
537-
BYTE map[32];
537+
BYTE[32] map;
538538
}
539539

540540
/* Warning: this MUST match (up to component renaming) xListFontsWithInfoReply */
@@ -868,7 +868,7 @@ struct xGetKeyboardControlReply{
868868
CARD8 keyClickPercent, bellPercent;
869869
CARD16 bellPitch, bellDuration;
870870
CARD16 pad;
871-
BYTE map[32]; /* bit masks start here */
871+
BYTE[32] map; /* bit masks start here */
872872
}
873873

874874
struct xGetPointerControlReply{
@@ -1149,7 +1149,7 @@ struct _xEvent {
11491149
}
11501150
struct b{
11511151
Atom type;
1152-
INT8 bytes[20];
1152+
INT8[20] bytes;
11531153
}
11541154
}
11551155
}
@@ -1194,7 +1194,7 @@ struct xGenericEvent{
11941194

11951195
struct xKeymapEvent{
11961196
BYTE type;
1197-
BYTE map[31];
1197+
BYTE[31] map;
11981198
}
11991199

12001200
const size_t XEventSize = xEvent.sizeof;
@@ -1339,7 +1339,7 @@ struct xChangePropertyReq{
13391339
Window window;
13401340
Atom property, type;
13411341
CARD8 format;
1342-
BYTE pad[3];
1342+
BYTE[3] pad;
13431343
CARD32 nUnits; /* length of stuff following, depends on format */
13441344
}
13451345

@@ -1386,7 +1386,7 @@ version( X86_64 ){
13861386
CARD16 length;
13871387
Window destination;
13881388
CARD32 eventMask;
1389-
BYTE eventdata[SIZEOF!xEvent()]; /* the structure should have been quad-aligned */
1389+
BYTE[SIZEOF!xEvent()] eventdata; /* the structure should have been quad-aligned */
13901390
}
13911391
}
13921392
else{

‎deimos/X11/Xregion.d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,6 @@ const int NUMPTSTOBUFFER = 200;
144144
* the buffers together
145145
*/
146146
struct POINTBLOCK {
147-
XPoint pts[NUMPTSTOBUFFER];
147+
XPoint[NUMPTSTOBUFFER] pts;
148148
POINTBLOCK* next;
149149
}

‎deimos/X11/Xresource.d

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,10 @@ alias XrmValue* XrmValuePtr;
120120
*
121121
****************************************************************/
122122
struct _XrmHashBucketRec{}
123-
alias _XrmHashBucketRec* XrmHashBucket;
124-
alias XrmHashBucket* XrmHashTable;
125-
alias XrmHashTable XrmSearchList[];
126-
alias _XrmHashBucketRec* XrmDatabase;
123+
alias _XrmHashBucketRec* XrmHashBucket ;
124+
alias XrmHashBucket* XrmHashTable ;
125+
alias XrmHashTable[] XrmSearchList;
126+
alias _XrmHashBucketRec* XrmDatabase ;
127127

128128

129129
extern void XrmDestroyDatabase(

‎deimos/X11/extensions/Xrender.d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ struct XTrapezoid {
159159
}
160160

161161
struct XTransform {
162-
XFixed matrix[3][3];
162+
XFixed[3][3] matrix;
163163
}
164164

165165
struct XFilters {

0 commit comments

Comments
 (0)