Changeset 1503:c0005aee16ff in roaraudio

Timestamp:

04/01/09 17:48:08 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added config var if we have args in main()

Files:

• configure (modified) (3 diffs)
• roard/roard.c (modified) (6 diffs)

configure

@@ -70 +70 @@
 
 WITHOUT_VIO=''
+
+HAVE_MAIN_ARGS=true
 
 MINIMAL=false
@@ -328 +330 @@
    TARGET_MICROCONTROLLER=true
    CROSS_COMPILE=true
+   HAVE_MAIN_ARGS=false
   ;;
   '--target-win32')
@@ -544 +547 @@
  $NO_LISTEN    || echo '#define ROAR_SUPPORT_LISTEN'
  $META_DATA    && echo '#define ROAR_SUPPORT_META'
+ echo
+
+ $HAVE_MAIN_ARGS && echo '#define ROAR_HAVE_MAIN_ARGS'
+
  echo
 

roard/roard.c

@@ -29 +29 @@
 #endif
 
+#ifdef ROAR_HAVE_MAIN_ARGS
 void usage (void) {
  printf("Usage: roard [OPTIONS]...\n\n");
@@ -109 +110 @@
  printf("\n");
 }
+#endif
 
 int restart_server (char * server) {
@@ -269 +271 @@
 }
 
+#ifdef ROAR_HAVE_MAIN_ARGS
 int main (int argc, char * argv[]) {
+#else
+int main (void) {
+#endif
+#ifdef ROAR_HAVE_MAIN_ARGS
  int i;
  char * k;
+#endif
 #ifdef ROAR_SUPPORT_LISTEN
  char user_sock[80]  = {0};
@@ -283 +291 @@
  char * driver    = NULL;
  char * device    = NULL;
+#ifdef ROAR_HAVE_MAIN_ARGS
  char * opts      = NULL;
+#endif
 // char * server = ROAR_DEFAULT_SOCK_GLOBAL;
 #ifdef ROAR_SUPPORT_LISTEN
@@ -381 +391 @@
  }
 
+#ifdef ROAR_HAVE_MAIN_ARGS
  for (i = 1; i < argc; i++) {
   k = argv[i];
@@ -596 +607 @@
 
  }
+#endif
 
  if ( s_dev != NULL ) {