Changeset 5951:b0e1eff45456 in roaraudio


Ignore:
Timestamp:
10/31/13 12:20:38 (6 years ago)
Author:
phi
Branch:
default
Message:

more header cleanup: cleanup of #includes

Files:
5 edited

Legend:

Unmodified
Added
Removed
  • include/libroar/libroar.h

    r5945 r5951  
    4141#include <roaraudio.h> 
    4242 
     43// Parameter passing: 
     44 
    4345#include <stdarg.h> 
     46 
     47// Process control: 
    4448 
    4549#ifdef ROAR_HAVE_WAIT 
     
    4751#endif 
    4852 
     53// File handle control: 
     54 
    4955#ifdef ROAR_HAVE_H_FCNTL 
    5056#include <fcntl.h> 
    5157#endif 
    5258 
     59// Signal handling: 
     60 
    5361#ifdef ROAR_HAVE_H_SIGNAL 
    5462#include <signal.h> 
    5563#endif 
    5664 
     65// Logging: 
     66 
    5767#ifdef ROAR_HAVE_SYSLOG 
    5868#include <syslog.h> 
    5969#endif 
    6070 
    61 #ifdef ROAR_HAVE_BSDSOCKETS 
    62  
    63 #ifndef ROAR_TARGET_WIN32 
     71// Network: 
     72 
     73#ifdef ROAR_TARGET_WIN32 
     74#include <winsock2.h> 
     75#elif defined(ROAR_HAVE_BSDSOCKETS) 
     76 
    6477#ifdef ROAR_HAVE_H_SYS_SOCKET 
    6578#include <sys/socket.h> 
    6679#endif 
     80 
    6781#ifdef ROAR_HAVE_IPV4 
    6882#include <netinet/in_systm.h> 
    6983#include <netinet/in.h> 
    7084#include <netinet/ip.h> 
    71 #endif 
     85#include <netinet/tcp.h> 
     86#endif 
     87 
     88#if defined(ROAR_HAVE_IPV4) || defined(ROAR_HAVE_IPV6) 
     89#include <arpa/inet.h> 
     90#endif 
     91 
    7292#include <sys/uio.h> 
    7393 
    7494#ifdef ROAR_HAVE_UNIX 
    7595#include <sys/un.h> 
    76 #endif 
    7796#endif 
    7897 
     
    88107#endif /* ROAR_HAVE_BSDSOCKETS */ 
    89108 
     109#if !defined(ROAR_TARGET_WIN32) && !defined(ROAR_TARGET_MICROCONTROLLER) 
     110#include <netdb.h> 
     111#endif 
     112 
     113// OpenSSL (crypto): 
     114 
    90115#ifdef ROAR_HAVE_LIBSSL 
    91116#include <openssl/bio.h> 
    92117#include <openssl/evp.h> 
    93118#endif 
     119 
     120// OpenSLP (autoconf): 
    94121 
    95122#ifdef ROAR_HAVE_LIBSLP 
     
    100127#endif 
    101128 
     129// Time related: 
     130 
    102131#ifdef ROAR_HAVE_H_TIME 
    103132#include <time.h> 
    104133#endif 
    105134 
     135// Dynamic loader: 
     136 
    106137#if defined(ROAR_HAVE_H_DLFCN) 
    107138#include <dlfcn.h> 
    108139#endif 
     140 
     141// X11: 
    109142 
    110143#ifdef ROAR_HAVE_LIBX11 
  • include/roaraudio.h

    r5823 r5951  
    7878#endif 
    7979 
    80 // TODO: can we move the next block into roard specific includes? 
    81 #if !defined(ROAR_TARGET_WIN32) && !defined(ROAR_TARGET_MICROCONTROLLER) 
    82 #include <grp.h> 
    83 #include <pwd.h> 
    84 #endif 
    85  
    8680#ifdef ROAR_HAVE_H_SYS_STAT 
    8781#include <sys/stat.h> 
    88 #endif 
    89  
    90 #ifdef ROAR_TARGET_WIN32 
    91 #include <winsock2.h> 
    92 #else /* ROAR_TARGET_WIN32 */ 
    93 #ifdef ROAR_HAVE_BSDSOCKETS 
    94  
    95 #ifdef ROAR_HAVE_H_SYS_SOCKET 
    96 #include <sys/socket.h> 
    97 #endif 
    98  
    99 #ifdef ROAR_HAVE_IPV4 
    100 #include <netinet/in.h> 
    101 #include <netinet/tcp.h> 
    102 #endif 
    103 #ifdef ROAR_HAVE_UNIX 
    104 #include <sys/un.h> 
    105 #endif 
    106  
    107 #if defined(ROAR_HAVE_IPV4) || defined(ROAR_HAVE_IPV6) 
    108 #include <arpa/inet.h> 
    109 #endif 
    110  
    111 #endif /* ROAR_HAVE_BSDSOCKETS */ 
    112 #endif /* ROAR_TARGET_WIN32 */ 
    113  
    114 #ifdef __NetBSD__ 
    115 #include <netinet/in_systm.h> 
    116 #endif 
    117  
    118 #if !defined(ROAR_TARGET_WIN32) && !defined(ROAR_TARGET_MICROCONTROLLER) 
    119 #include <netdb.h> 
    12082#endif 
    12183 
  • libroar/basic.c

    r5901 r5951  
    3636#include "libroar.h" 
    3737 
     38#if !defined(ROAR_TARGET_WIN32) && !defined(ROAR_TARGET_MICROCONTROLLER) 
     39#include <pwd.h> 
     40#endif 
     41 
    3842enum mode { 
    3943 NORMAL = 0, 
  • libroar/socket.c

    r5896 r5951  
    3737#include "libroar.h" 
    3838 
     39#if defined(ROAR_SUPPORT_PROXY) && !defined(ROAR_TARGET_WIN32) && !defined(ROAR_TARGET_MICROCONTROLLER) 
     40#include <pwd.h> 
     41#endif 
     42 
    3943#define MODE_LISTEN  ROAR_SOCKET_MODE_LISTEN 
    4044#define MODE_CONNECT ROAR_SOCKET_MODE_CONNECT 
  • roard/include/roard.h

    r5823 r5951  
    5555 
    5656#if !defined(ROAR_TARGET_WIN32) && !defined(ROAR_TARGET_MICROCONTROLLER) 
     57#include <grp.h> 
    5758#include <pwd.h> 
    5859#endif 
Note: See TracChangeset for help on using the changeset viewer.