Skip to content

Commit 11e9d2d

Browse files
authored
Merge pull request #345 from martinezjavier/fix-multiple-def-error
fix link error due multiple variables definitions
2 parents 0c7cdaf + be710ea commit 11e9d2d

File tree

2 files changed

+26
-37
lines changed

2 files changed

+26
-37
lines changed

source/constants.c

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -35,39 +35,41 @@ SOFTWARE.
3535

3636
void define_constants(PyObject *module)
3737
{
38-
high = Py_BuildValue("i", HIGH);
39-
PyModule_AddObject(module, "HIGH", high);
38+
PyObject *object;
4039

41-
low = Py_BuildValue("i", LOW);
42-
PyModule_AddObject(module, "LOW", low);
40+
object = Py_BuildValue("i", HIGH);
41+
PyModule_AddObject(module, "HIGH", object);
4342

44-
output = Py_BuildValue("i", OUTPUT);
45-
PyModule_AddObject(module, "OUT", output);
43+
object = Py_BuildValue("i", LOW);
44+
PyModule_AddObject(module, "LOW", object);
4645

47-
input = Py_BuildValue("i", INPUT);
48-
PyModule_AddObject(module, "IN", input);
46+
object = Py_BuildValue("i", OUTPUT);
47+
PyModule_AddObject(module, "OUT", object);
4948

50-
alt0 = Py_BuildValue("i", ALT0);
51-
PyModule_AddObject(module, "ALT0", alt0);
49+
object = Py_BuildValue("i", INPUT);
50+
PyModule_AddObject(module, "IN", object);
5251

53-
pud_off = Py_BuildValue("i", PUD_OFF);
54-
PyModule_AddObject(module, "PUD_OFF", pud_off);
52+
object = Py_BuildValue("i", ALT0);
53+
PyModule_AddObject(module, "ALT0", object);
5554

56-
pud_up = Py_BuildValue("i", PUD_UP);
57-
PyModule_AddObject(module, "PUD_UP", pud_up);
55+
object = Py_BuildValue("i", PUD_OFF);
56+
PyModule_AddObject(module, "PUD_OFF", object);
5857

59-
pud_down = Py_BuildValue("i", PUD_DOWN);
60-
PyModule_AddObject(module, "PUD_DOWN", pud_down);
58+
object = Py_BuildValue("i", PUD_UP);
59+
PyModule_AddObject(module, "PUD_UP", object);
60+
61+
object = Py_BuildValue("i", PUD_DOWN);
62+
PyModule_AddObject(module, "PUD_DOWN", object);
6163

62-
rising_edge = Py_BuildValue("i", RISING_EDGE);
63-
PyModule_AddObject(module, "RISING", rising_edge);
64+
object = Py_BuildValue("i", RISING_EDGE);
65+
PyModule_AddObject(module, "RISING", object);
6466

65-
falling_edge = Py_BuildValue("i", FALLING_EDGE);
66-
PyModule_AddObject(module, "FALLING", falling_edge);
67+
object = Py_BuildValue("i", FALLING_EDGE);
68+
PyModule_AddObject(module, "FALLING", object);
6769

68-
both_edge = Py_BuildValue("i", BOTH_EDGE);
69-
PyModule_AddObject(module, "BOTH", both_edge);
70+
object = Py_BuildValue("i", BOTH_EDGE);
71+
PyModule_AddObject(module, "BOTH", object);
7072

71-
version = Py_BuildValue("s", "0.0.20");
72-
PyModule_AddObject(module, "VERSION", version);
73+
object = Py_BuildValue("s", "0.0.20");
74+
PyModule_AddObject(module, "VERSION", object);
7375
}

source/constants.h

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,6 @@
11
#ifndef CONSTANTS_H
22
#define CONSTANTS_H
33

4-
PyObject *high;
5-
PyObject *low;
6-
PyObject *input;
7-
PyObject *output;
8-
PyObject *alt0;
9-
PyObject *pud_off;
10-
PyObject *pud_up;
11-
PyObject *pud_down;
12-
PyObject *rising_edge;
13-
PyObject *falling_edge;
14-
PyObject *both_edge;
15-
PyObject *version;
16-
174
void define_constants(PyObject *module);
185

196
#endif

0 commit comments

Comments
 (0)