Ignore:
Timestamp:
Feb 25, 2023, 6:45:44 PM (3 years ago)
Author:
caparson <caparson@…>
Branches:
ADT, ast-experimental, master
Children:
601bd9e
Parents:
ce44c5f (diff), 2d028003 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:
libcfa/src/concurrency/clib
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • libcfa/src/concurrency/clib/cfathread.cfa

    rce44c5f rd964c39  
    1616// #define EPOLL_FOR_SOCKETS
    1717
    18 #include <sys/socket.h> // first include because of anonymous types __SOCKADDR_ARG, __CONST_SOCKADDR_ARG
    1918#include <string.h>
    2019#include <errno.h>
     20#include <unistd.h>
     21#include <sys/socket.h>
    2122
    2223#include "fstream.hfa"
     
    2728#include "time.hfa"
    2829#include "stdlib.hfa"
    29 
     30#include "iofwd.hfa"
    3031#include "cfathread.h"
    3132
     
    470471}
    471472
    472 #include <unistd.h>
    473 
    474 #include <iofwd.hfa>
    475 
    476473extern "C" {
    477474        //--------------------
  • libcfa/src/concurrency/clib/cfathread.h

    rce44c5f rd964c39  
    1010// Created On       : Tue Sep 22 15:31:20 2020
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Thu Feb 16 12:00:32 2023
    13 // Update Count     : 5
     12// Last Modified On : Sat Feb 25 17:39:20 2023
     13// Update Count     : 6
    1414//
    1515
    1616#if defined(__cforall) || defined(__cplusplus)
    17 #include <sys/socket.h> // first include because of anonymous types __SOCKADDR_ARG, __CONST_SOCKADDR_ARG
    1817#include <unistd.h>
    1918#include <errno.h>
     19#include <sys/socket.h>
    2020
    2121extern "C" {
Note: See TracChangeset for help on using the changeset viewer.