Skip to contentSkip to conversation

Couple of alsa-tools patches from Gentoo

PATCH New Diego Elio 'Flameeyes' Pettenò 2 participants 4 messages May 27, 2009 – May 29, 2009

lore
Share & tools
lore
#0 lore raw

I already sent a link to the git repository where I pushed this last week, but given I'm actually going to remove it (need to reduce the number of repos on the server), I thought it would be easier just to send them as they are.

One fixes build with glibc-2.10, the other fixes --as-needed in general.

HTH,

Signature · 5 lines
Diego E. Pettenò — Flameeyes
_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
#1 lore raw

PATCH 1/2 Don't redeclare isblank().

While technically isblank() is a C library function, nothing stops it from being a macro, and indeed it seems to be on glibc-2.10.

This should not be a problem because ctype.h already declares it on probably all the systems where it's used.

---
 envy24control/strstr_icase_blank.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
envy24control/strstr_icase_blank.c +0 -1
index af44854..4c325cf 100644
@@ -48,7 +48,6 @@ int strstr_icase_blank(const char * const string1, const char * const string2)
 	char search_string[MAX_SEARCH_FIELD_LENGTH];
 	char *pstr;
 	int pos_first_non_blank;
-	int isblank(int c);
 
 	strncpy(search_string, string2, MAX_SEARCH_FIELD_LENGTH);
 	search_string[MAX_SEARCH_FIELD_LENGTH - 1] = '\0';
Signature · 1 line
1.6.3.1
#2 lore raw

PATCH 2/2 Also fix the configure for hdspconf for LIBS/LDFLAGS mistakes.

Commit 56970e8143b4d171a118d114b1ddfa7621401127 already took care of this for the other tools, but hdspconf somewhat was excluded, fix this now.

---
 hdspconf/configure.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
hdspconf/configure.in +1 -1
index 1aa6feb..a32ff5f 100644
@@ -36,6 +36,6 @@ FLTK_CXXFLAGS="`$FLTK_CONFIG $fltk_config_args --cxxflags` -fno-exceptions"
 FLTK_LIBS=`$FLTK_CONFIG $fltk_config_args --ldflags`
 
 CXXFLAGS="$CXXFLAGS $ALSA_CFLAGS $FLTK_CXXFLAGS"
-LDFLAGS="$LDFLAGS $ALSA_LIBS $FLTK_LIBS"
+LIBS="$LIBS $ALSA_LIBS $FLTK_LIBS"
 
 AC_OUTPUT(Makefile src/Makefile pixmaps/Makefile)
Signature · 1 line
1.6.3.1
#3 lore raw
In reply to Diego Elio 'Flameeyes' Pettenò

At Wed, 27 May 2009 23:20:32 +0200,

Quoted 8 lines · Diego Elio 'Flameeyes' Pettenò

I already sent a link to the git repository where I pushed this last week, but given I'm actually going to remove it (need to reduce the number of repos on the server), I thought it would be easier just to send them as they are.

One fixes build with glibc-2.10, the other fixes --as-needed in general.

OK, applied now. Thanks!

Takashi