Skip to content

Solution for Issue #170#172

Merged
mastertheknife merged 2 commits intoZoneMinder:masterfrom
raulcaj:patch-1
Sep 24, 2013
Merged

Solution for Issue #170#172
mastertheknife merged 2 commits intoZoneMinder:masterfrom
raulcaj:patch-1

Conversation

@raulcaj
Copy link
Contributor

@raulcaj raulcaj commented Sep 24, 2013

This would be a valid solution for the problem I talked about on #170

@mastertheknife
Copy link
Contributor

mastertheknife commented Sep 24, 2013

Looks good. Thank you!

mastertheknife added a commit that referenced this pull request Sep 24, 2013
@mastertheknife
Merge pull request #172 from raulcaj/patch-1
171bf4a 
Solution for Issue #170
@mastertheknife mastertheknife merged commit 171bf4a into ZoneMinder:master Sep 24, 2013
@raulcaj raulcaj deleted the patch-1 branch September 24, 2013 20:26
@knight-of-ni
Copy link
Member

knight-of-ni commented Sep 24, 2013

I noticed that zm_logger.cpp:522 is preceded by #ifdef HAVE_SYSCALL
Shouldn't we do the same for the changes to zm_timer & zm_thread?

@mastertheknife mastertheknife mentioned this pull request Sep 24, 2013
Closed
@raulcaj
Copy link
Contributor Author

raulcaj commented Sep 24, 2013

Oh, since I just 'grep'ed the file I didn't see that. Yes, I think we
should.

2013/9/24 Andy Bauer notifications@github.com

I noticed that zm_logger.cpp:522 is preceded by #ifdef HAVE_SYSCALL
Shouldn't we do the same for the changes to zm_imer & zm_thread?

—
Reply to this email directly or view it on GitHubhttps://github.com//pull/172#issuecomment-25039377
.

@mastertheknife
Copy link
Contributor

mastertheknife commented Sep 24, 2013

@knnniggett,
HAVE_SYSCALL is just something that our configure.ac sets for us. syscall() is available on all linux platforms. No need for that.

@mastertheknife
Copy link
Contributor

mastertheknife commented Sep 25, 2013

Okay i just noticed that even before this merge, zm_thread and zm_timer do not include sys/syscall.h as required, and zm_logger includes the wrong header file (syscall.h. should be sys/syscall.h)
I'll fix this all manually.

@mastertheknife
Copy link
Contributor

mastertheknife commented Sep 25, 2013

Fixed in commit e8d20fa

@knight-of-ni knight-of-ni mentioned this pull request Nov 8, 2015
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@raulcaj @mastertheknife @knight-of-ni