Ignore:
Timestamp:
Apr 9, 2008, 10:22:08 PM (17 years ago)
Author:
cinc
Message:

Portability patches for Windows, Linux, Darwin by Bird.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/tests/c/test-nom.c

    r323 r326  
    3232*
    3333* ***** END LICENSE BLOCK ***** */
    34 #define INCL_DOSPROCESS
    35 #define INCL_DOS
    36 #define INCL_DOSPROFILE
    37 #define INCL_DOSERRORS
    38 
    39 #include <os2.h>
     34#ifdef __OS2__
     35# define INCL_DOSPROCESS
     36# define INCL_DOS
     37# define INCL_DOSPROFILE
     38# define INCL_DOSERRORS
     39# include <os2.h>
     40#endif /* __OS2__ */
     41
    4042#include <stdio.h>
    4143#include <stdlib.h>
    4244#include <string.h>
    4345
    44 #include <io.h>
     46#ifdef HAVE_IO_H
     47# include <io.h>
     48#endif
     49#ifdef HAVE_UNISTD_H
     50# include <unistd.h>
     51#endif
    4552#include <fcntl.h>
    46 #include <sys\stat.h>
     53#include <sys/stat.h>
    4754
    4855#include <glib.h>
    … …  
    8996void tstAClassInstanceVarInitValues(AClass * aObject)
    9097{
    91   ULONG ulRC;
     98  gulong ulRC;
    9299
    93100  g_message("================================================================");
    … …  
    95102  g_message("================================================================");
    96103 
    97   ulRC=_tstQueryUlongVar1(aObject, NULLHANDLE);
     104  ulRC=_tstQueryUlongVar1(aObject, NULL);
    98105  g_message("Calling tstQueryUlongVar1():\t%ld\t\t%s", ulRC, (0!=ulRC ? "FAILED" : "OK"));
    99106  g_assert(0==ulRC);
    100107 
    101   ulRC=_tstQueryUlongVar2(aObject, NULLHANDLE);
     108  ulRC=_tstQueryUlongVar2(aObject, NULL);
    102109  g_message("Calling tstQueryUlongVar2():\t%ld\t\t%s\n", ulRC, (0!=ulRC ? "FAILED" : "OK"));
    103110  g_assert(0==ulRC);
    … …  
    107114void tstBClassInstanceVarInitValues(BClass * aObject)
    108115{
    109   ULONG ulRC;
     116  gulong ulRC;
    110117
    111118  g_message("================================================================");
    … …  
    113120  g_message("================================================================");
    114121 
    115   ulRC=_tstQueryBClassUlongVar1(aObject, NULLHANDLE);
     122  ulRC=_tstQueryBClassUlongVar1(aObject, NULL);
    116123  g_message("Calling tstQueryBClassUlongVar1():\t%ld\t\t%s", ulRC, (0!=ulRC ? "FAILED" : "OK"));
    117124  g_assert(0==ulRC);
    118125 
    119   ulRC=_tstQueryBClassUlongVar2(aObject, NULLHANDLE);
     126  ulRC=_tstQueryBClassUlongVar2(aObject, NULL);
    120127  g_message("Calling tstQueryBClassUlongVar2():\t%ld\t\t%s\n", ulRC, (0!=ulRC ? "FAILED" : "OK"));
    121128  g_assert(0==ulRC);
    … …  
    125132void tstSetAClassInstanceVar(AClass * aObject)
    126133{
    127   ULONG ulRC;
     134  gulong ulRC;
    128135
    129136  g_message("========================================================");
    … …  
    131138  g_message("========================================================");
    132139  /* Set 1. value */
    133   _tstSetUlongVar1(aObject, ULONG_TESTVALUE_1, NULLHANDLE);
    134   ulRC=_tstQueryUlongVar1(aObject, NULLHANDLE);
    135   g_message("Calling tstQueryUlongVar1():\t0x%lx\t\t%s", ulRC, (ULONG_TESTVALUE_1!=ulRC ? "FAILED" : "OK"));
    136   g_assert(ULONG_TESTVALUE_1==ulRC);
    137 
    138   ulRC=_tstQueryUlongVar2(aObject, NULLHANDLE);
     140  _tstSetUlongVar1(aObject, ULONG_TESTVALUE_1, NULL);
     141  ulRC=_tstQueryUlongVar1(aObject, NULL);
     142  g_message("Calling tstQueryUlongVar1():\t0x%lx\t\t%s", ulRC, (ULONG_TESTVALUE_1!=ulRC ? "FAILED" : "OK"));
     143  g_assert(ULONG_TESTVALUE_1==ulRC);
     144
     145  ulRC=_tstQueryUlongVar2(aObject, NULL);
    139146  g_message("Calling tstQueryUlongVar2():\t0x%lx\t\t\t%s\n", ulRC, (0!=ulRC ? "FAILED" : "OK"));
    140147  g_assert(0==ulRC);
    141148
    142149  /* Set 2. value */
    143   _tstSetUlongVar2(aObject, ULONG_TESTVALUE_2, NULLHANDLE);
    144   ulRC=_tstQueryUlongVar1(aObject, NULLHANDLE);
    145   g_message("Calling tstQueryUlongVar1():\t0x%lx\t\t%s", ulRC, (ULONG_TESTVALUE_1!=ulRC ? "FAILED" : "OK"));
    146   g_assert(ULONG_TESTVALUE_1==ulRC);
    147 
    148   ulRC=_tstQueryUlongVar2(aObject, NULLHANDLE);
     150  _tstSetUlongVar2(aObject, ULONG_TESTVALUE_2, NULL);
     151  ulRC=_tstQueryUlongVar1(aObject, NULL);
     152  g_message("Calling tstQueryUlongVar1():\t0x%lx\t\t%s", ulRC, (ULONG_TESTVALUE_1!=ulRC ? "FAILED" : "OK"));
     153  g_assert(ULONG_TESTVALUE_1==ulRC);
     154
     155  ulRC=_tstQueryUlongVar2(aObject, NULL);
    149156  g_message("Calling tstQueryUlongVar2():\t0x%lx\t\t%s\n\n", ulRC, (ULONG_TESTVALUE_2!=ulRC ? "FAILED" : "OK"));
    150157  g_assert(ULONG_TESTVALUE_2==ulRC);
    … …  
    153160void tstSetBClassInstanceVar(BClass * aObject)
    154161{
    155   ULONG ulRC;
     162  gulong ulRC;
    156163
    157164  g_message("========================================================");
    … …  
    159166  g_message("========================================================");
    160167  /* Set 1. value */
    161   _tstSetBClassUlongVar1(aObject, ULONG_TESTVALUE_BCLASS_1, NULLHANDLE);
     168  _tstSetBClassUlongVar1(aObject, ULONG_TESTVALUE_BCLASS_1, NULL);
    162169
    163170  /* AClass */
    164   ulRC=_tstQueryUlongVar1(aObject, NULLHANDLE);
    165   g_message("Calling tstQueryUlongVar1():\t0x%lx\t\t%s", ulRC, (ULONG_TESTVALUE_1!=ulRC ? "FAILED" : "OK"));
    166   g_assert(ULONG_TESTVALUE_1==ulRC);
    167   ulRC=_tstQueryUlongVar2(aObject, NULLHANDLE);
     171  ulRC=_tstQueryUlongVar1(aObject, NULL);
     172  g_message("Calling tstQueryUlongVar1():\t0x%lx\t\t%s", ulRC, (ULONG_TESTVALUE_1!=ulRC ? "FAILED" : "OK"));
     173  g_assert(ULONG_TESTVALUE_1==ulRC);
     174  ulRC=_tstQueryUlongVar2(aObject, NULL);
    168175  g_message("Calling tstQueryUlongVar2():\t0x%lx\t\t%s", ulRC, (ULONG_TESTVALUE_2!=ulRC ? "FAILED" : "OK"));
    169176  g_assert(ULONG_TESTVALUE_2==ulRC);
    170177
    171178  /* BClass*/
    172   ulRC=_tstQueryBClassUlongVar1(aObject, NULLHANDLE);
     179  ulRC=_tstQueryBClassUlongVar1(aObject, NULL);
    173180  g_message("Calling tstQueryBClassUlongVar1():\t0x%lx\t\t%s", ulRC, (ULONG_TESTVALUE_BCLASS_1!=ulRC ? "FAILED" : "OK"));
    174181  g_assert(ULONG_TESTVALUE_BCLASS_1==ulRC);
    175182
    176   ulRC=_tstQueryBClassUlongVar2(aObject, NULLHANDLE);
     183  ulRC=_tstQueryBClassUlongVar2(aObject, NULL);
    177184  g_message("Calling tstQueryBClassUlongVar2():\t0x%lx\t\t\t%s\n\n", ulRC, (0!=ulRC ? "FAILED" : "OK"));
    178185  g_assert(0==ulRC);
    … …  
    181188
    182189  /* Set 2. value */
    183   _tstSetBClassUlongVar2(aObject, ULONG_TESTVALUE_BCLASS_2, NULLHANDLE);
     190  _tstSetBClassUlongVar2(aObject, ULONG_TESTVALUE_BCLASS_2, NULL);
    184191
    185192  /* AClass */
    186   ulRC=_tstQueryUlongVar1(aObject, NULLHANDLE);
    187   g_message("Calling tstQueryUlongVar1():\t0x%lx\t\t%s", ulRC, (ULONG_TESTVALUE_1!=ulRC ? "FAILED" : "OK"));
    188   g_assert(ULONG_TESTVALUE_1==ulRC);
    189   ulRC=_tstQueryUlongVar2(aObject, NULLHANDLE);
     193  ulRC=_tstQueryUlongVar1(aObject, NULL);
     194  g_message("Calling tstQueryUlongVar1():\t0x%lx\t\t%s", ulRC, (ULONG_TESTVALUE_1!=ulRC ? "FAILED" : "OK"));
     195  g_assert(ULONG_TESTVALUE_1==ulRC);
     196  ulRC=_tstQueryUlongVar2(aObject, NULL);
    190197  g_message("Calling tstQueryUlongVar2():\t0x%lx\t\t%s", ulRC, (ULONG_TESTVALUE_2!=ulRC ? "FAILED" : "OK"));
    191198  g_assert(ULONG_TESTVALUE_2==ulRC);
    192199
    193200  /* BClass*/
    194   ulRC=_tstQueryBClassUlongVar1(aObject, NULLHANDLE);
     201  ulRC=_tstQueryBClassUlongVar1(aObject, NULL);
    195202  g_message("Calling tstQueryBClassUlongVar1():\t0x%lx\t\t%s", ulRC, (ULONG_TESTVALUE_BCLASS_1!=ulRC ? "FAILED" : "OK"));
    196203  g_assert(ULONG_TESTVALUE_BCLASS_1==ulRC);
    197204
    198   ulRC=_tstQueryBClassUlongVar2(aObject, NULLHANDLE);
     205  ulRC=_tstQueryBClassUlongVar2(aObject, NULL);
    199206  g_message("Calling tstQueryBClassUlongVar2():\t0x%lx\t\t%s\n\n", ulRC, (ULONG_TESTVALUE_BCLASS_2!=ulRC ? "FAILED" : "OK"));
    200207  g_assert(ULONG_TESTVALUE_BCLASS_2==ulRC);
    … …  
    209216{
    210217  NOMClassMgr *NOMClassMgrObject;
    211   HREGDLL hReg=NULLHANDLE;
     218  HREGDLL hReg=NULL;
    212219  AClass*  aObject;
    213220  BClass*  bObject;
    … …  
    226233  /* Register DLLs with the garbage collector */
    227234  hReg=nomBeginRegisterDLLWithGC();
    228   if(NULLHANDLE==hReg)
     235  if(NULL==hReg)
    229236    return 1;
    230237
Note: See TracChangeset for help on using the changeset viewer.