Changeset 5683:4101c33111f7 in roaraudio


Ignore:
Timestamp:
09/26/12 10:10:35 (12 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

avoid null as it is a reserved keyword on win32.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • libroar/uuid.c

    r5667 r5683  
    8686 
    8787const roar_uuid_t * roar_uuid_get_ns_real(const char * ns) { 
    88  static const roar_uuid_t * __null = NULL, 
     88 static const roar_uuid_t 
    8989  dns  = {0x6b, 0xa7, 0xb8, 0x10, 0x9d, 0xad, 0x11, 0xd1, 0x80, 0xb4, 0x00, 0xc0, 0x4f, 0xd4, 0x30, 0xc8}, 
    9090  url  = {0x6b, 0xa7, 0xb8, 0x11, 0x9d, 0xad, 0x11, 0xd1, 0x80, 0xb4, 0x00, 0xc0, 0x4f, 0xd4, 0x30, 0xc8}, 
    9191  oid  = {0x6b, 0xa7, 0xb8, 0x12, 0x9d, 0xad, 0x11, 0xd1, 0x80, 0xb4, 0x00, 0xc0, 0x4f, 0xd4, 0x30, 0xc8}, 
    9292  x500 = {0x6b, 0xa7, 0xb8, 0x14, 0x9d, 0xad, 0x11, 0xd1, 0x80, 0xb4, 0x00, 0xc0, 0x4f, 0xd4, 0x30, 0xc8}; 
     93 static const void * null_ptr = NULL; 
    9394 
    9495 if ( ns == NULL ) { 
    9596  roar_err_set(ROAR_ERROR_FAULT); 
    96   return __null; 
     97  return (const roar_uuid_t *)&null_ptr; 
    9798 } 
    9899 
     
    108109 
    109110 roar_err_set(ROAR_ERROR_NOENT); 
    110  return __null; 
     111 return (const roar_uuid_t *)&null_ptr; 
    111112} 
    112113 
Note: See TracChangeset for help on using the changeset viewer.