Revision 47

View differences:

logic/trunk/src/init/scenariolist.c
1 1
#include "scenariolist.h"
2 2
#include "devicelist.h"
3 3
#include "../logics/conditions.h"
4
#include <mxml.h>
4
//#include <mxml.h>
5
#include "../mxml/mxml.h"
5 6

  
6

  
7 7
//extern device *hDevice;   //device list
8 8

  
9 9
short NUMBER_OF_SCENARIOS = 0;
logic/trunk/src/init/devicelist.h
16 16
int     setNewDeviceList(); // ony called on startup
17 17
int     getNumberOfDevices();
18 18
device *getDevice(device *dev, char *devName);
19
device *getDevice1(char *devName);
20
device *getDevice2(device *dev);
21 19
device *getAvailableDevice(device *dev);
22 20
int     getLocalFormattedTime();
23 21

  
logic/trunk/src/init/devicelist.c
1 1
#include "devicelist.h"
2 2
#include <string.h>
3
#include <mxml.h>
3
//#include <mxml.h>
4
#include "../mxml/mxml.h"
4 5
#include <time.h>
6
#include <stdio.h>
5 7

  
6 8
short NUMBER_OF_DEVICES   = 0;
7 9

  

Also available in: Unified diff