diff options
author | jestin | 2000-01-14 14:57:14 +0000 |
---|---|---|
committer | jestin | 2000-01-14 14:57:14 +0000 |
commit | 4f77562958164548d8c64f95edb5ceaa9258e062 (patch) | |
tree | 9ce4f0b3abcb373e799dd1b7c9d94930c18d5602 | |
parent | 748d6faeaa7248a6b84f2f314b376b3029ed2cde (diff) | |
download | ivy-c-4f77562958164548d8c64f95edb5ceaa9258e062.zip ivy-c-4f77562958164548d8c64f95edb5ceaa9258e062.tar.gz ivy-c-4f77562958164548d8c64f95edb5ceaa9258e062.tar.bz2 ivy-c-4f77562958164548d8c64f95edb5ceaa9258e062.tar.xz |
J'enlève list.h, qui est fourni par utils-c-dev, et qui entre en conflit
avec icelui. Du coup, hop ! Dépendance.
-rw-r--r-- | debian/changelog | 4 | ||||
-rw-r--r-- | debian/control | 2 | ||||
-rw-r--r-- | src/list.h | 55 |
3 files changed, 5 insertions, 56 deletions
diff --git a/debian/changelog b/debian/changelog index 568c24d..17c4299 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,7 @@ +ivy-c (3.1-5) unstable; urgency=low + + * add a dependance for utils-c-dev, which provides list.h ... + ivy-c (3.1-4) unstable; urgency=low * resolve a conflict between ivy-c and ivy-c-dev due to a wrong version number in control file diff --git a/debian/control b/debian/control index a6e4ff3..47f1afa 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Description: Bus logiciel PII. Package: ivy-c-dev Architecture: any -Depends: ivy-c (= 3.1-4), libc6-dev, xlib6g-dev +Depends: ivy-c (= 3.1-5), libc6-dev, xlib6g-dev, utils-c-dev Provides: ivy-c-dev Conflicts: ivy-c-dev Description: Bus logiciel PII. diff --git a/src/list.h b/src/list.h deleted file mode 100644 index 4a6fe26..0000000 --- a/src/list.h +++ /dev/null @@ -1,55 +0,0 @@ -#define LIST_ITER( list, p, cond ) \ - p = list; \ - while ( p && (cond) ) p = p->next - -#define LIST_REMOVE( list, p ) \ - { \ - void *toRemove; \ - if ( list == p ) \ - { \ - list = p->next; \ - free(p);\ - } \ - else \ - {\ - toRemove = p;\ - LIST_ITER( list, p, ( p->next != toRemove ));\ - if ( p )\ - {\ - /* somme tricky swapping to use a untyped variable */\ - void *suiv; \ - void *prec = p;\ - p = toRemove;\ - suiv = p->next;\ - p = prec;\ - p->next = suiv;\ - free(toRemove);\ - }\ - } \ - } - -#define LIST_ADD(list, p ) \ - if ((p = malloc( sizeof( *p ))))\ - { \ - memset( p, 0 , sizeof( *p ));\ - p->next = list; \ - list = p; \ - } - -#define LIST_EACH( list, p ) \ - for ( p = list ; p ; p = p -> next ) - -#define LIST_EACH_SAFE( list, p, next )\ -for ( p = list ; (next = p ? p->next: p ),p ; p = next ) - - -#define LIST_EMPTY( list ) \ - { \ - void *p; \ - while( list ) \ - { \ - p = list;\ - list = list->next; \ - free(p);\ - } \ - } |