OpenSDE
/
package-nopast
3
0
Fork 0
Code Issues 9 Projects 1 Releases Activity
OpenSDE Packages Database (without history before r20070)
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
11859 Commits
49 Branches
0 Tags
34 MiB
Tree: bfaf191309
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from 'bfaf191309'
${ noResults }
package-nopast/base/util-linux/0001-replace-container_of.p...

60 lines
2.8 KiB
Raw Normal View History

util-linux: Updated (2.22.2 -> 2.23.2) Thanks to Alejandro for providing help and his container_of implementation taken from sancus-core. https://github.com/sancus-project/sancus-core/blob/master/include/sancus_common.h
11 years ago
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
  1. # --- SDE-COPYRIGHT-NOTE-BEGIN ---
  2. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  3. #
  4. # Filename: package/.../util-linux/0001-replace-container_of.patch
  5. # Copyright (C) 2013 The OpenSDE Project
  6. #
  7. # More information can be found in the files COPYING and README.
  8. #
  9. # This patch file is dual-licensed. It is available under the license the
  10. # patched project is licensed under, as long as it is an OpenSource license
  11. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12. # of the GNU General Public License as published by the Free Software
  13. # Foundation; either version 2 of the License, or (at your option) any later
  14. # version.
  15. # --- SDE-COPYRIGHT-NOTE-END ---
  17. This patch is fixing build issues by using a more simple but reasonable
  18. container_of function without abusing __typeof__.
  19. Besides that it is removing code duplication because the list_entry function
  20. macro is the same as container_of.
  22. Without the patch we are getting following error:
  23. ------------------------------------------------------------------------------
  24. sys-utils/prlimit.c: In function 'show_limits':
  25. sys-utils/prlimit.c:299:25: error: expected declaration specifiers or '...' before '(' token
  26. sys-utils/prlimit.c:299:25: error: '__mptr' undeclared (first use in this function)
  27. sys-utils/prlimit.c:299:25: note: each undeclared identifier is reported only once for each function it appears in
  28. sys-utils/prlimit.c: In function 'do_prlimit':
  29. sys-utils/prlimit.c:336:25: error: expected declaration specifiers or '...' before '(' token
  30. sys-utils/prlimit.c:336:25: error: '__mptr' undeclared (first use in this function
  31. ------------------------------------------------------------------------------
  33. --- util-linux-2.23.2/include/c.h.orig 2013-08-27 10:32:00.890399403 +0200
  34. +++ util-linux-2.23.2/include/c.h 2013-08-27 10:41:56.872040920 +0200
  35. @@ -115,9 +115,8 @@
  36. #endif
  38. #ifndef container_of
  39. -#define container_of(ptr, type, member) ({ \
  40. - const __typeof__( ((type *)0)->member ) *__mptr = (ptr); \
  41. - (type *)( (char *)__mptr - offsetof(type,member) );})
  42. +#define container_of(ptr, type, member) \
  43. + ((type *)((char *)(ptr) - offsetof(type, member)))
  44. #endif
  46. #ifndef HAVE_PROGRAM_INVOCATION_SHORT_NAME
  47. --- util-linux-2.23.2/include/list.h.orig 2013-08-27 10:35:19.025606381 +0200
  48. +++ util-linux-2.23.2/include/list.h 2013-08-27 10:36:09.172435338 +0200
  49. @@ -166,10 +166,7 @@
  50. * @type: the type of the struct this is embedded in.
  51. * @member: the name of the list_struct within the struct.
  52. */
  53. -#define list_entry(ptr, type, member) ({ \
  54. - const typeof( ((type *)0)->member ) *__mptr = (ptr); \
  55. - (type *)( (char *)__mptr - offsetof(type,member) );})
  56. -
  57. +#define list_entry container_of
  59. #define list_first_entry(head, type, member) \
  60. ((head) && (head)->next != (head) ? list_entry((head)->next, type, member) : NULL)