Merge remote-tracking branch 'origin/framepars'

7869cf5a · Mikhail Karpenko · 4ae324c3 · d8b4639d · 7869cf5a · 7869cf5a
Commit 7869cf5a authored Sep 16, 2016 by Mikhail Karpenko
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 52 additions and 31 deletions

.project eclipse_project_setup/.project +0 -10

elphel_php.c src/ext/elphel/elphel_php.c +48 -18

elphel_php.h src/ext/elphel/elphel_php.h +4 -3

No files found.
--- a/eclipse_project_setup/.project
+++ b/eclipse_project_setup/.project
@@ -16,16 +16,6 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
-			<triggers>full,incremental,</triggers>
-			<arguments>
-				<dictionary>
-					<key>LaunchConfigHandle</key>
-					<value>&lt;project&gt;/.externalToolBuilders/org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder (1).launch</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.cdt.core.cnature</nature>

--- a/src/ext/elphel/elphel_php.c
+++ b/src/ext/elphel/elphel_php.c
--- a/src/ext/elphel/elphel_php.h
+++ b/src/ext/elphel/elphel_php.h
@@ -8,10 +8,11 @@
 #warning Not using TSRM.h
 #endif

-#include "elphel/c313a.h"
-#include "elphel/exifa.h"
-#include <autoexp.h>
+#include <elphel/c313a.h>
+#include <elphel/exifa.h>
 #include <elphel/x393_devices.h>
+//#include <autoexp.h>
+//#include <elphel/x393_devices.h>

 ZEND_BEGIN_MODULE_GLOBALS(elphel)
 int fd_exif[SENSOR_PORTS];