Changeset 989:3546df4ceb78 in roaraudio

Timestamp:

12/18/08 16:10:02 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

abstract from LP64 to ROAR_INSTINT

Files:

• libroar/vio.c (modified) (3 diffs)
• roard/driver_roar.c (modified) (1 diff)

libroar/vio.c

@@ -35 +35 @@
 #include "libroar.h"
 
-// this is to avoid warning messages on platforms
-// where sizeof(void*) == 8 and szeof(int) == 4
-#ifdef __LP64__
-#define INSTINT long int
-#else
-#define INSTINT int
-#endif
-
 int roar_vio_init_calls (struct roar_vio_calls * calls) {
  if ( !calls )
@@ -72 +64 @@
 
 int roar_vio_set_fh   (struct roar_vio_calls * vio, int fh) {
- return roar_vio_set_inst(vio, (void*)(INSTINT)(fh + 1));
+ return roar_vio_set_inst(vio, (void*)(ROAR_INSTINT)(fh + 1));
 }
 
@@ -79 +71 @@
   return -1;
 
- return ((int)(INSTINT)vio->inst) - 1;
+ return ((int)(ROAR_INSTINT)vio->inst) - 1;
 }
 

roard/driver_roar.c

@@ -24 +24 @@
 
 #include "roard.h"
-
-// this is to avoid warning messages on platforms
-// where sizeof(void*) == 8 and szeof(int) == 4
-#ifdef __LP64__
-#define INSTINT long int
-#else
-#define INSTINT int
-#endif
 
 int driver_roar_open_vio(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh) {