]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
Merge branch 'lsfd/fcntl' of https://github.com/t-8ch/util-linux
authorKarel Zak <kzak@redhat.com>
Wed, 1 May 2024 19:17:52 +0000 (21:17 +0200)
committerKarel Zak <kzak@redhat.com>
Wed, 1 May 2024 19:17:52 +0000 (21:17 +0200)
* 'lsfd/fcntl' of https://github.com/t-8ch/util-linux:
  lsfd: include buffer.h in decode-file-flags.h
  buffer: replace include of c.h with stddef.h
  lsfd: move interface of decode-file-flags to header

1  2 
lsfd-cmd/decode-file-flags.c

index 29c8999cd3e0e91d67fbd76880e92b6d46dea47a,3f7ecd8f71246c5a2d34bda73ff57fe034b826c6..322216c11ffed294c0dad78f3fa9045aa5b6d089
   * /usr/include/fcntl.h includes /usr/include/bits/fcntl.h.
   */
  
 -#if defined HAVE_ASM_FCNTL_H
 -#include <asm/fcntl.h>
 -#elif defined HAVE_ASM_GENERIC_FCNTL_H
 -#include <asm-generic/fcntl.h>
 -#else
 -#error "kernel's fcntl.h is not available"
 -#endif
 +#include <linux/fcntl.h>
  
- #include <stddef.h>           /* for size_t */
- struct ul_buffer;
- void lsfd_decode_file_flags(struct ul_buffer *buf, int flags);
- /* We cannot include buffer.h because buffer.h includes
-  * /usr/include/fcntl.h indirectly. */
- extern int ul_buffer_is_empty(struct ul_buffer *buf);
- extern int ul_buffer_append_data(struct ul_buffer *buf, const char *data, size_t sz);
- extern int ul_buffer_append_string(struct ul_buffer *buf, const char *str);
+ #include "decode-file-flags.h"
  
  void lsfd_decode_file_flags(struct ul_buffer *buf, int flags)
  {