MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2025-12-15 15:53:55 +00:00
Code Issues Releases Wiki Activity

Fixed #ifdef

Browse Source
This commit is contained in:
Bryan Roe
2020-05-20 13:14:39 -07:00
parent f4b7c13888
commit 655e607e01
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
microstack/ILibParsers.h
View File

@@ -998,8 +998,6 @@ int ILibIsRunningOnChainThread(void* chain);
char *metadata; char *metadata;
}ILibChain_WriteEx_data; }ILibChain_WriteEx_data;
char *ILibChain_MetaData(char *file, int number);
int ILibGetMillisecondTimeSpan(struct timeval *tv1, struct timeval *tv2);
void* ILibChain_WaitHandle_RemoveAndSaveState(void *chain, HANDLE h); void* ILibChain_WaitHandle_RemoveAndSaveState(void *chain, HANDLE h);
void ILibChain_WaitHandle_RestoreState(void *chain, void *state); void ILibChain_WaitHandle_RestoreState(void *chain, void *state);
BOOL ILibChain_WaitHandleAdded(void *chain, HANDLE h); BOOL ILibChain_WaitHandleAdded(void *chain, HANDLE h);
@@ -1011,10 +1009,14 @@ int ILibIsRunningOnChainThread(void* chain);
ILibTransport_DoneState ILibChain_WriteEx2(void *chain, HANDLE h, OVERLAPPED *p, char *buffer, int bufferLen, ILibChain_WriteEx_Handler handler, void *user, char *metadata); ILibTransport_DoneState ILibChain_WriteEx2(void *chain, HANDLE h, OVERLAPPED *p, char *buffer, int bufferLen, ILibChain_WriteEx_Handler handler, void *user, char *metadata);
#define ILibChain_WriteEx(chain, h, overlapped, buffer, bufferLen, handler, user) ILibChain_WriteEx2(chain, h, overlapped, buffer, bufferLen, handler, user, ILibChain_MetaData(__FILE__, __LINE__)) #define ILibChain_WriteEx(chain, h, overlapped, buffer, bufferLen, handler, user) ILibChain_WriteEx2(chain, h, overlapped, buffer, bufferLen, handler, user, ILibChain_MetaData(__FILE__, __LINE__))
#endif
char *ILibChain_MetaData(char *file, int number);
int ILibGetMillisecondTimeSpan(struct timeval *tv1, struct timeval *tv2);
#define tv2LTtv1(ptv1, ptv2) ((ptv2)->tv_sec < (ptv1)->tv_sec || ((ptv2)->tv_sec == (ptv1)->tv_sec && (ptv2)->tv_usec < (ptv1)->tv_usec)) #define tv2LTtv1(ptv1, ptv2) ((ptv2)->tv_sec < (ptv1)->tv_sec || ((ptv2)->tv_sec == (ptv1)->tv_sec && (ptv2)->tv_usec < (ptv1)->tv_usec))
#define tv2LTEtv1(ptv1, ptv2) (tv2LTtv1(ptv2,ptv1) || ((ptv2)->tv_sec == (ptv1)->tv_sec && (ptv2)->tv_usec <= (ptv1)->tv_usec)) #define tv2LTEtv1(ptv1, ptv2) (tv2LTtv1(ptv2,ptv1) || ((ptv2)->tv_sec == (ptv1)->tv_sec && (ptv2)->tv_usec <= (ptv1)->tv_usec))
#define tvnonzero(ptv) ((ptv)->tv_sec != 0 || (ptv)->tv_usec != 0) #define tvnonzero(ptv) ((ptv)->tv_sec != 0 || (ptv)->tv_usec != 0)
#endif
void ILibChain_InitDescriptorCount(void *chain); void ILibChain_InitDescriptorCount(void *chain);
int ILibChain_GetDescriptorCount(void *chain); int ILibChain_GetDescriptorCount(void *chain);
ILibExportMethod void ILibStartChain(void *chain); ILibExportMethod void ILibStartChain(void *chain);

2
microstack/ILibProcessPipe.c
View File

@@ -95,10 +95,10 @@ typedef struct ILibProcessPipe_PipeObject
OVERLAPPED *mOverlapped,*mwOverlapped; OVERLAPPED *mOverlapped,*mwOverlapped;
int inProgress; int inProgress;
void *mOverlapped_opaqueData, *user3, *user4; void *mOverlapped_opaqueData, *user3, *user4;
char *metadata;
#else #else
int mPipe_ReadEnd, mPipe_WriteEnd; int mPipe_ReadEnd, mPipe_WriteEnd;
#endif #endif
char *metadata;
int PAUSED; int PAUSED;
}ILibProcessPipe_PipeObject; }ILibProcessPipe_PipeObject;