Changeset 6:53519b47b166 in vscpl


Ignore:
Timestamp:
01/19/13 15:51:59 (11 years ago)
Author:
István Váradi <ivaradi@…>
Branch:
default
hg-Phase:
(<MercurialRepository 1 'hg:/home/ivaradi/xplane/hg/vscpl' '/'>, 'public')
Message:

Imported some further stuff from the IO code

Files:
36 added
11 edited
1 copied

Legend:

Unmodified
Added
Removed

  • configure.ac

    r2 r6  
    2020        src/hu/varadiistvan/scpl/_posix/Makefile
    2121        src/hu/varadiistvan/scpl/_win32/Makefile
     22        src/hu/varadiistvan/scpl/io/Makefile
     23        src/hu/varadiistvan/scpl/io/_posix/Makefile
     24        src/hu/varadiistvan/scpl/io/_win32/Makefile
    2225        misc/Makefile
    2326        misc/vscpl.m4

  • src/hu/varadiistvan/scpl/CondVar.h

    r5 r6  
    2828
    2929#ifndef HU_VARADIISTVAN_SCPL_CONDVAR_H
    30 #define HU_VARADIISTVAN_SCPL__CONDVAR_H
     30#define HU_VARADIISTVAN_SCPL_CONDVAR_H
    3131//------------------------------------------------------------------------------
    3232
    … …  
    8282//------------------------------------------------------------------------------
    8383
    84 #include "config.h"
     84#include "hu/varadiistvan/scpl/config.h"
    8585
    8686//------------------------------------------------------------------------------

  • src/hu/varadiistvan/scpl/Makefile.am

    r5 r6  
    1 SUBDIRS=
     1SUBDIRS=io
    22
    33if TARGET_API_POSIX
    … …  
    1515        dummy.cc
    1616
     17libvscpl_la_LIBADD=
     18
    1719if TARGET_API_POSIX
    18 libvscpl_la_LIBADD=_posix/libvscpl_posix.la
     20libvscpl_la_LIBADD+=_posix/libvscpl_posix.la
    1921endif
    2022
    2123if TARGET_API_WIN32
    22 libvscpl_la_LIBADD=_win32/libvscpl_win32.la
     24libvscpl_la_LIBADD+=_win32/libvscpl_win32.la
    2325endif
     26
     27libvscpl_la_LIBADD+=io/libvscpl_io.la
    2428
    2529include_vscpldir=$(includedir)/hu/varadiistvan/scpl
    2630include_vscpl_HEADERS=\
    2731        config.h                \
     32        types.h                 \
    2833        Thread.h                \
    2934        Mutex.h                 \

  • src/hu/varadiistvan/scpl/Mutex.h

    r4 r6  
    2828
    2929#ifndef HU_VARADIISTVAN_SCPL_MUTEX_H
    30 #define HU_VARADIISTVAN_SCPL__MUTEX_H
     30#define HU_VARADIISTVAN_SCPL_MUTEX_H
    3131//------------------------------------------------------------------------------
    3232
    … …  
    7474//------------------------------------------------------------------------------
    7575
    76 #include "config.h"
     76#include "hu/varadiistvan/scpl/config.h"
    7777
    7878//------------------------------------------------------------------------------

  • src/hu/varadiistvan/scpl/Thread.h

    r3 r6  
    9595//------------------------------------------------------------------------------
    9696
    97 #include "config.h"
     97#include "hu/varadiistvan/scpl/config.h"
    9898
    9999//------------------------------------------------------------------------------

  • src/hu/varadiistvan/scpl/_posix/CondVar.h

    r5 r6  
    2727// either expressed or implied, of the FreeBSD Project.
    2828
    29 #ifndef HU_VARADIISTVAN_SCPL_CONDVAR_H
    30 #define HU_VARADIISTVAN_SCPL_CONDVAR_H
     29#ifndef HU_VARADIISTVAN_SCPL_POSIX_CONDVAR_H
     30#define HU_VARADIISTVAN_SCPL_POSIX_CONDVAR_H
    3131//------------------------------------------------------------------------------
    3232

  • src/hu/varadiistvan/scpl/_posix/Mutex.h

    r4 r6  
    2727// either expressed or implied, of the FreeBSD Project.
    2828
    29 #ifndef HU_VARADIISTVAN_SCPL_MUTEX_H
    30 #define HU_VARADIISTVAN_SCPL_MUTEX_H
     29#ifndef HU_VARADIISTVAN_SCPL_POSIX_MUTEX_H
     30#define HU_VARADIISTVAN_SCPL_POSIX_MUTEX_H
    3131//------------------------------------------------------------------------------
    3232
    … …  
    124124
    125125//------------------------------------------------------------------------------
    126 #endif // HU_VARADIISTVAN_SCPL_MUTEX_H
     126#endif // HU_VARADIISTVAN_SCPL_POSIX_MUTEX_H
    127127
    128128// Local Variables:

  • src/hu/varadiistvan/scpl/_win32/CondVar.h

    r5 r6  
    2727// either expressed or implied, of the FreeBSD Project.
    2828
    29 #ifndef HU_VARADIISTVAN_SCPL_CONDVAR_H
    30 #define HU_VARADIISTVAN_SCPL_CONDVAR_H
     29#ifndef HU_VARADIISTVAN_SCPL_WIN32_CONDVAR_H
     30#define HU_VARADIISTVAN_SCPL_WIN32_CONDVAR_H
    3131//------------------------------------------------------------------------------
    3232
    … …  
    160160
    161161//------------------------------------------------------------------------------
    162 #endif // HU_VARADIISTVAN_SCPL_CONDVAR_H
     162#endif // HU_VARADIISTVAN_SCPL_WIN32_CONDVAR_H
    163163
    164164// Local Variables:

  • src/hu/varadiistvan/scpl/_win32/Mutex.h

    r4 r6  
    2727// either expressed or implied, of the FreeBSD Project.
    2828
    29 #ifndef HU_VARADIISTVAN_SCPL_MUTEX_H
    30 #define HU_VARADIISTVAN_SCPL_MUTEX_H
     29#ifndef HU_VARADIISTVAN_SCPL_WIN32_MUTEX_H
     30#define HU_VARADIISTVAN_SCPL_WIN32_MUTEX_H
    3131//------------------------------------------------------------------------------
    3232
    … …  
    124124
    125125//------------------------------------------------------------------------------
    126 #endif // HU_VARADIISTVAN_SCPL_MUTEX_H
     126#endif // HU_VARADIISTVAN_SCPL_WIN32_MUTEX_H
    127127
    128128// Local Variables:

  • src/hu/varadiistvan/scpl/hgccwrapper

    r4 r6  
    3636
    3737#ifndef HU_VARADIISTVAN_SCPL_${uppername}_H
    38 #define HU_VARADIISTVAN_SCPL__${uppername}_H
     38#define HU_VARADIISTVAN_SCPL_${uppername}_H
    3939//------------------------------------------------------------------------------
    4040
    … …  
    6262//------------------------------------------------------------------------------
    6363
    64 #include "config.h"
     64#include "hu/varadistvan/scpl/config.h"
    6565
    6666//------------------------------------------------------------------------------

  • src/hu/varadiistvan/scpl/io/hgccwrapper

    r4 r6  
    3535// either expressed or implied, of the FreeBSD Project.
    3636
    37 #ifndef HU_VARADIISTVAN_SCPL_${uppername}_H
    38 #define HU_VARADIISTVAN_SCPL__${uppername}_H
     37#ifndef HU_VARADIISTVAN_SCPL_IO_${uppername}_H
     38#define HU_VARADIISTVAN_SCPL_IO_${uppername}_H
    3939//------------------------------------------------------------------------------
    4040
    … …  
    4343//------------------------------------------------------------------------------
    4444
    45 namespace hu { namespace varadiistvan { namespace scpl {
     45namespace hu { namespace varadiistvan { namespace scpl { namespace io {
    4646
    4747//------------------------------------------------------------------------------
    … …  
    5454//------------------------------------------------------------------------------
    5555
    56 } /* namespace hu::varadiistvan::scpl */ } /* namespace hu::varadiistvan */ } /* namespace hu */
     56} /* namespace hu::varadiistvan::scpl::io */ } /* namespace hu::varadiistvan::scpl */ } /* namespace hu::varadiistvan */ } /* namespace hu */
    5757
    5858//------------------------------------------------------------------------------
    … …  
    6262//------------------------------------------------------------------------------
    6363
    64 #include "config.h"
     64#include "hu/varadiistvan/scpl/config.h"
    6565
    6666//------------------------------------------------------------------------------

  • test/Makefile.am

    r5 r6  
    1 INCLUDES=-I$(top_srcdir)/src -I../src/hu/varadiistvan/scpl
     1INCLUDES=-I$(top_srcdir)/src -I$(top_builddir)/src
    22
    33noinst_PROGRAMS=testthread testmutex testcondvar
Note: See TracChangeset for help on using the changeset viewer.