Browse Source
Merge commit '77ef4c2' into cg_merges_20121208
Conflicts:
libztex.c
Luke Dashjr
13 years ago
1 changed files with
2 additions and
1 deletions
-
2
1
libztex.c
|
@@ -24,10 +24,11 @@
|
|
|
|
|
|
|
|
#define _GNU_SOURCE
|
|
#define _GNU_SOURCE
|
|
|
|
|
|
|
|
|
|
+#include "config.h"
|
|
|
|
|
+
|
|
|
#include <stdio.h>
|
|
#include <stdio.h>
|
|
|
#include <unistd.h>
|
|
#include <unistd.h>
|
|
|
#include <string.h>
|
|
#include <string.h>
|
|
|
-#include <config.h>
|
|
|
|
|
|
|
|
|
|
#include "dynclock.h"
|
|
#include "dynclock.h"
|
|
|
#include "miner.h"
|
|
#include "miner.h"
|
