Changeset 1232
- Timestamp:
- Feb 12, 2004, 4:21:45 PM (22 years ago)
- Location:
- trunk/testcase
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/testcase/572c.c
-
Property cvs2svn:cvs-rev
changed from
1.4
to1.5
r1231 r1232 37 37 typedef int (_Optlink Typedef2Int)(int a, int b, int c, int d); 38 38 typedef PTYPE (_Optlink Typedef2PType)(int a, int b, int c, int d); 39 #ifdef __EMX__ 40 typedef void _Optlink (Typedef3Void)(int a, int b, int c, int d); 41 typedef void * _Optlink (Typedef3PVoid)(int a, int b, int c, int d); 42 typedef int _Optlink (Typedef3Int)(int a, int b, int c, int d); 43 typedef PTYPE _Optlink (Typedef3PType)(int a, int b, int c, int d); 44 #endif 39 45 40 46 typedef void (* _Optlink PTypedef1Void)(int a, int b, int c, int d); … … 48 54 typedef int (_Optlink * PTypedef2Int)(int a, int b, int c, int d); 49 55 typedef PTYPE (_Optlink * PTypedef2PType)(int a, int b, int c, int d); 50 56 #ifdef __EMX__ 57 /* Alternate writing which should have the same effect I think... */ 58 typedef void _Optlink (* PTypedef3Void)(int a, int b, int c, int d); 59 typedef void * _Optlink (* PTypedef3PVoid)(int a, int b, int c, int d); 60 typedef int _Optlink (* PTypedef3Int)(int a, int b, int c, int d); 61 typedef PTYPE _Optlink (* PTypedef3PType)(int a, int b, int c, int d); 62 #endif 51 63 52 64 /* … … 66 78 PTYPE (_Optlink * PStructMember2PType)(int a, int b, int c, int d); 67 79 80 #ifdef __EMX__ 81 /* Alternate writing which should have the same effect I think... */ 82 void _Optlink (* PStructMember3Void)(int a, int b, int c, int d); 83 void * _Optlink (* PStructMember3PVoid)(int a, int b, int c, int d); 84 int _Optlink (* PStructMember3Int)(int a, int b, int c, int d); 85 PTYPE _Optlink (* PStructMember3PType)(int a, int b, int c, int d); 86 #endif 68 87 } VFT, *PVFT; 69 88 … … 82 101 int (_Optlink * PVar2Int)(int a, int b, int c, int d); 83 102 PTYPE (_Optlink * PVar2PType)(int a, int b, int c, int d); 103 104 #ifdef __EMX__ 105 void _Optlink (* PVar3Void)(int a, int b, int c, int d); 106 void * _Optlink (* PVar3PVoid)(int a, int b, int c, int d); 107 int _Optlink (* PVar3Int)(int a, int b, int c, int d); 108 PTYPE _Optlink (* PVar3PType)(int a, int b, int c, int d); 109 #endif 84 110 85 111 … … 96 122 int (_Optlink * pfn2Int)(int a, int b, int c, int d), 97 123 PTYPE (_Optlink * pfn2PType)(int a, int b, int c, int d) 124 #ifdef __EMX__ 125 , 126 void _Optlink (* pfn3Void)(int a, int b, int c, int d), 127 void * _Optlink (* pfn3PVoid)(int a, int b, int c, int d), 128 int _Optlink (* pfn3Int)(int a, int b, int c, int d), 129 PTYPE _Optlink (* pfn3PType)(int a, int b, int c, int d) 130 #endif 98 131 ) 99 132 { … … 107 140 pfn2Int(1,2,3,4); 108 141 pfn2PType(1,2,3,4); 142 143 #ifdef __EMX__ 144 pfn3Void(1,2,3,4); 145 pfn3PVoid(1,2,3,4); 146 pfn3Int(1,2,3,4); 147 pfn3PType(1,2,3,4); 148 #endif 109 149 return 0; 110 150 } 151 152 /* @todo: extend and fix this */ 153 extern void ParamArgs_1(void (_Optlink *)(void)); 154 extern void ParamArgs_2(void (* _Optlink fixme) (void)); 155 #ifdef __EMX__ 156 extern void ParamArgs_3(void _Optlink (*)(void)); 157 #endif 111 158 112 159 … … 114 161 { 115 162 static VFT vft = {CVoid, CPVoid, CInt, CPType, 163 #ifdef __EMX__ 164 CVoid, CPVoid, CInt, CPType, 165 #endif 116 166 CVoid, CPVoid, CInt, CPType}; 117 167 … … 125 175 static Typedef2Int * pfnTypedef2Int = CInt; 126 176 static Typedef2PType * pfnTypedef2PType = CPType; 177 #ifdef __EMX__ 178 static Typedef3Void * pfnTypedef3Void = CVoid; 179 static Typedef3PVoid * pfnTypedef3PVoid = CPVoid; 180 static Typedef3Int * pfnTypedef3Int = CInt; 181 static Typedef3PType * pfnTypedef3PType = CPType; 182 #endif 127 183 128 184 static PTypedef1Void pfnPTypedef1Void = CVoid; … … 136 192 static PTypedef2PType pfnPTypedef2PType = CPType; 137 193 194 #ifdef __EMX__ 195 static PTypedef3Void pfnPTypedef3Void = CVoid; 196 static PTypedef3PVoid pfnPTypedef3PVoid = CPVoid; 197 static PTypedef3Int pfnPTypedef3Int = CInt; 198 static PTypedef3PType pfnPTypedef3PType = CPType; 199 #endif 200 138 201 PVar1Void = CVoid; 139 202 PVar1PVoid = CPVoid; … … 146 209 PVar2PType = CPType; 147 210 211 #ifdef __EMX__ 212 PVar3Void = CVoid; 213 PVar3PVoid = CPVoid; 214 PVar3Int = CInt; 215 PVar3PType = CPType; 216 #endif 148 217 149 218 /* extern functions */ … … 164 233 pfnTypedef2PType(1,2,3,4); 165 234 235 #ifdef __EMX__ 236 pfnTypedef3Void(1,2,3,4); 237 pfnTypedef3PVoid(1,2,3,4); 238 pfnTypedef3Int(1,2,3,4); 239 pfnTypedef3PType(1,2,3,4); 240 #endif 241 166 242 pfnPTypedef1Void(1,2,3,4); 167 243 pfnPTypedef1PVoid(1,2,3,4); … … 174 250 pfnPTypedef2PType(1,2,3,4); 175 251 252 #ifdef __EMX__ 253 pfnPTypedef3Void(1,2,3,4); 254 pfnPTypedef3PVoid(1,2,3,4); 255 pfnPTypedef3Int(1,2,3,4); 256 pfnPTypedef3PType(1,2,3,4); 257 #endif 176 258 177 259 /* structs */ … … 186 268 vft.PStructMember2PType(1,2,3,4); 187 269 270 #ifdef __EMX__ 271 vft.PStructMember3Void(1,2,3,4); 272 vft.PStructMember3PVoid(1,2,3,4); 273 vft.PStructMember3Int(1,2,3,4); 274 vft.PStructMember3PType(1,2,3,4); 275 #endif 276 188 277 /* variables */ 189 278 PVar1Void(1,2,3,4); … … 199 288 /* parameters */ 200 289 ParamArgs(CVoid, CPVoid, CInt, CPType, 290 #ifdef __EMX__ 291 CVoid, CPVoid, CInt, CPType, 292 #endif 201 293 CVoid, CPVoid, CInt, CPType); 202 294 -
Property cvs2svn:cvs-rev
changed from
-
trunk/testcase/572main.cpp
-
Property cvs2svn:cvs-rev
changed from
1.4
to1.5
r1231 r1232 70 70 typedef int (_Optlink Typedef2Int)(int a, int b, int c, int d); 71 71 typedef PTYPE (_Optlink Typedef2PType)(int a, int b, int c, int d); 72 #ifdef __EMX__ 73 typedef void _Optlink (Typedef3Void)(int a, int b, int c, int d); 74 typedef void * _Optlink (Typedef3PVoid)(int a, int b, int c, int d); 75 typedef int _Optlink (Typedef3Int)(int a, int b, int c, int d); 76 typedef PTYPE _Optlink (Typedef3PType)(int a, int b, int c, int d); 77 #endif 72 78 73 79 typedef void (* _Optlink PTypedef1Void)(int a, int b, int c, int d); … … 81 87 typedef int (_Optlink * PTypedef2Int)(int a, int b, int c, int d); 82 88 typedef PTYPE (_Optlink * PTypedef2PType)(int a, int b, int c, int d); 89 #ifdef __EMX__ 90 /* Alternate writing which should have the same effect I think... */ 91 typedef void _Optlink (* PTypedef3Void)(int a, int b, int c, int d); 92 typedef void * _Optlink (* PTypedef3PVoid)(int a, int b, int c, int d); 93 typedef int _Optlink (* PTypedef3Int)(int a, int b, int c, int d); 94 typedef PTYPE _Optlink (* PTypedef3PType)(int a, int b, int c, int d); 95 #endif 83 96 84 97 … … 99 112 int (_Optlink * PStructMember2Int)(int a, int b, int c, int d); 100 113 PTYPE (_Optlink * PStructMember2PType)(int a, int b, int c, int d); 114 #ifdef __EMX__ 115 /* Alternate writing which should have the same effect I think... */ 116 void _Optlink (* PStructMember3Void)(int a, int b, int c, int d); 117 void * _Optlink (* PStructMember3PVoid)(int a, int b, int c, int d); 118 int _Optlink (* PStructMember3Int)(int a, int b, int c, int d); 119 PTYPE _Optlink (* PStructMember3PType)(int a, int b, int c, int d); 120 #endif 101 121 102 122 } VFT, *PVFT; … … 116 136 int (_Optlink * PVar2Int)(int a, int b, int c, int d); 117 137 PTYPE (_Optlink * PVar2PType)(int a, int b, int c, int d); 138 #ifdef __EMX__ 139 void _Optlink (* PVar3Void)(int a, int b, int c, int d); 140 void * _Optlink (* PVar3PVoid)(int a, int b, int c, int d); 141 int _Optlink (* PVar3Int)(int a, int b, int c, int d); 142 PTYPE _Optlink (* PVar3PType)(int a, int b, int c, int d); 143 #endif 118 144 119 145 … … 130 156 int (_Optlink * pfn2Int)(int a, int b, int c, int d), 131 157 PTYPE (_Optlink * pfn2PType)(int a, int b, int c, int d) 158 #ifdef __EMX__ 159 , 160 void _Optlink (* pfn3Void)(int a, int b, int c, int d), 161 void * _Optlink (* pfn3PVoid)(int a, int b, int c, int d), 162 int _Optlink (* pfn3Int)(int a, int b, int c, int d), 163 PTYPE _Optlink (* pfn3PType)(int a, int b, int c, int d) 164 #endif 132 165 ) 133 166 { … … 141 174 pfn2Int(1,2,3,4); 142 175 pfn2PType(1,2,3,4); 176 #ifdef __EMX__ 177 pfn3Void(1,2,3,4); 178 pfn3PVoid(1,2,3,4); 179 pfn3Int(1,2,3,4); 180 pfn3PType(1,2,3,4); 181 #endif 143 182 return 0; 144 183 } 184 185 /* @todo: extend and fix this */ 186 extern void ParamArgs_1(void (_Optlink *)(void)); 187 extern void ParamArgs_2(void (* _Optlink fixme) (void)); 188 #ifdef __EMX__ 189 extern void ParamArgs_3(void _Optlink (*)(void)); 190 #endif 145 191 146 192 … … 149 195 { 150 196 static VFT vft = {Void, PVoid, Int, PType, 197 #ifdef __EMX__ 198 Void, PVoid, Int, PType, 199 #endif 151 200 Void, PVoid, Int, PType}; 152 201 … … 160 209 static Typedef2Int * pfnTypedef2Int = Int; 161 210 static Typedef2PType * pfnTypedef2PType = PType; 211 #ifdef __EMX__ 212 static Typedef3Void * pfnTypedef3Void = Void; 213 static Typedef3PVoid * pfnTypedef3PVoid = PVoid; 214 static Typedef3Int * pfnTypedef3Int = Int; 215 static Typedef3PType * pfnTypedef3PType = PType; 216 #endif 162 217 163 218 static PTypedef1Void pfnPTypedef1Void = Void; … … 170 225 static PTypedef2Int pfnPTypedef2Int = Int; 171 226 static PTypedef2PType pfnPTypedef2PType = PType; 227 #ifdef __EMX__ 228 static PTypedef3Void pfnPTypedef3Void = Void; 229 static PTypedef3PVoid pfnPTypedef3PVoid = PVoid; 230 static PTypedef3Int pfnPTypedef3Int = Int; 231 static PTypedef3PType pfnPTypedef3PType = PType; 232 #endif 172 233 173 234 PVar1Void = Void; … … 180 241 PVar2Int = Int; 181 242 PVar2PType = PType; 182 243 #ifdef __EMX__ 244 PVar3Void = Void; 245 PVar3PVoid = PVoid; 246 PVar3Int = Int; 247 PVar3PType = PType; 248 #endif 183 249 184 250 /* extern functions */ … … 215 281 pfnTypedef2Int(1,2,3,4); 216 282 pfnTypedef2PType(1,2,3,4); 283 #ifdef __EMX__ 284 pfnTypedef3Void(1,2,3,4); 285 pfnTypedef3PVoid(1,2,3,4); 286 pfnTypedef3Int(1,2,3,4); 287 pfnTypedef3PType(1,2,3,4); 288 #endif 217 289 218 290 pfnPTypedef1Void(1,2,3,4); … … 225 297 pfnPTypedef2Int(1,2,3,4); 226 298 pfnPTypedef2PType(1,2,3,4); 299 #ifdef __EMX__ 300 pfnPTypedef3Void(1,2,3,4); 301 pfnPTypedef3PVoid(1,2,3,4); 302 pfnPTypedef3Int(1,2,3,4); 303 pfnPTypedef3PType(1,2,3,4); 304 #endif 227 305 228 306 … … 237 315 vft.PStructMember2Int(1,2,3,4); 238 316 vft.PStructMember2PType(1,2,3,4); 317 #ifdef __EMX__ 318 vft.PStructMember3Void(1,2,3,4); 319 vft.PStructMember3PVoid(1,2,3,4); 320 vft.PStructMember3Int(1,2,3,4); 321 vft.PStructMember3PType(1,2,3,4); 322 #endif 239 323 240 324 /* variables */ … … 251 335 /* parameters */ 252 336 ParamArgs(Void, PVoid, Int, PType, 337 #ifdef __EMX__ 338 Void, PVoid, Int, PType, 339 #endif 253 340 Void, PVoid, Int, PType); 254 341 -
Property cvs2svn:cvs-rev
changed from
Note:
See TracChangeset
for help on using the changeset viewer.